Fix increment on nullable

test/codegen/expect/dart/collection.js

 var collection;
 (function(exports) {
   'use strict';
   let _length = Symbol('_length');
   let _strings = Symbol('_strings');
   let _nums = Symbol('_nums');
   let _rest = Symbol('_rest');
   let _keys = Symbol('_keys');
   let _containsKey = Symbol('_containsKey');
   let _getBucket = Symbol('_getBucket');
@@ skipping 97 matching lines @@
         }
       }
       [_set](key, value) {
         let rest = this[_rest];
         if (rest === null)
           this[_rest] = rest = _newHashTable();
         let hash = this[_computeHashCode](key);
         let bucket = rest[hash];
         if (bucket === null) {
           _setTableEntry(rest, hash, [key, value]);
-          dart.notNull(this[_length])++;
+          this[_length] = dart.notNull(this[_length]) + 1;
           this[_keys] = null;
         } else {
           let index = this[_findBucketIndex](bucket, key);
           if (dart.notNull(index) >= 0) {
             bucket[dart.notNull(index) + 1] = value;
           } else {
             bucket.push(key, value);
-            dart.notNull(this[_length])++;
+            this[_length] = dart.notNull(this[_length]) + 1;
             this[_keys] = null;
           }
         }
       }
       putIfAbsent(key, ifAbsent) {
         if (this.containsKey(key))
           return this.get(key);
         let value = ifAbsent();
         this.set(key, value);
         return value;
       }
       remove(key) {
         if (_isStringKey(key)) {
           return this[_removeHashTableEntry](this[_strings], key);
         } else if (_isNumericKey(key)) {
           return this[_removeHashTableEntry](this[_nums], key);
         } else {
           return this[_remove](key);
         }
       }
       [_remove](key) {
         let rest = this[_rest];
         if (rest === null)
           return null;
         let bucket = this[_getBucket](rest, key);
         let index = this[_findBucketIndex](bucket, key);
         if (dart.notNull(index) < 0)
           return null;
-        dart.notNull(this[_length])--;
+        this[_length] = dart.notNull(this[_length]) - 1;
         this[_keys] = null;
         return dart.as(bucket.splice(index, 2)[1], V);
       }
       clear() {
         if (dart.notNull(this[_length]) > 0) {
           this[_strings] = this[_nums] = this[_rest] = this[_keys] = null;
           this[_length] = 0;
         }
       }
       forEach(action) {
         let keys = this[_computeKeys]();
-        for (let i = 0, length = keys.length; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0, length = keys.length; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let key = keys[i];
           action(dart.as(key, K), this.get(key));
           if (keys !== this[_keys]) {
             throw new core.ConcurrentModificationError(this);
           }
         }
       }
       [_computeKeys]() {
         if (this[_keys] !== null)
           return this[_keys];
         let result = new core.List(this[_length]);
         let index = 0;
         let strings = this[_strings];
         if (strings !== null) {
           let names = Object.getOwnPropertyNames(strings);
           let entries = names.length;
-          for (let i = 0; dart.notNull(i) < dart.notNull(entries); dart.notNull(i)++) {
+          for (let i = 0; dart.notNull(i) < dart.notNull(entries); i = dart.notNull(i) + 1) {
             let key = names[i];
             result[index] = key;
-            dart.notNull(index)++;
+            index = dart.notNull(index) + 1;
           }
         }
         let nums = this[_nums];
         if (nums !== null) {
           let names = Object.getOwnPropertyNames(nums);
           let entries = names.length;
-          for (let i = 0; dart.notNull(i) < dart.notNull(entries); dart.notNull(i)++) {
+          for (let i = 0; dart.notNull(i) < dart.notNull(entries); i = dart.notNull(i) + 1) {
             let key = +names[i];
             result[index] = key;
-            dart.notNull(index)++;
+            index = dart.notNull(index) + 1;
           }
         }
         let rest = this[_rest];
         if (rest !== null) {
           let names = Object.getOwnPropertyNames(rest);
           let entries = names.length;
-          for (let i = 0; dart.notNull(i) < dart.notNull(entries); dart.notNull(i)++) {
+          for (let i = 0; dart.notNull(i) < dart.notNull(entries); i = dart.notNull(i) + 1) {
             let key = names[i];
             let bucket = rest[key];
             let length = bucket.length;
             for (let i = 0; dart.notNull(i) < dart.notNull(length); i = 2) {
               let key = bucket[i];
               result[index] = key;
-              dart.notNull(index)++;
+              index = dart.notNull(index) + 1;
             }
           }
         }
         dart.assert(index === this[_length]);
         return this[_keys] = result;
       }
       [_addHashTableEntry](table, key, value) {
         if (!dart.notNull(_hasTableEntry(table, key))) {
-          dart.notNull(this[_length])++;
+          this[_length] = dart.notNull(this[_length]) + 1;
           this[_keys] = null;
         }
         _setTableEntry(table, key, value);
       }
       [_removeHashTableEntry](table, key) {
         if (dart.notNull(table !== null) && dart.notNull(_hasTableEntry(table, key))) {
           let value = dart.as(_getTableEntry(table, key), V);
           _deleteTableEntry(table, key);
-          dart.notNull(this[_length])--;
+          this[_length] = dart.notNull(this[_length]) - 1;
           this[_keys] = null;
           return value;
         } else {
           return null;
         }
       }
       static [_isStringKey](key) {
         return dart.notNull(typeof key == string) && dart.notNull(!dart.equals(key, '__proto__'));
       }
       static [_isNumericKey](key) {
@@ skipping 127 matching lines @@
         return dart.equals(dart.dload(this[_map], '_length'), 0);
       }
       get iterator() {
         return new HashMapKeyIterator(this[_map], dart.as(dart.dinvoke(this[_map], '_computeKeys'), core.List));
       }
       contains(element) {
         return dart.as(dart.dinvoke(this[_map], 'containsKey', element), core.bool);
       }
       forEach(f) {
         let keys = dart.as(dart.dinvoke(this[_map], '_computeKeys'), core.List);
-        for (let i = 0, length = keys.length; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0, length = keys.length; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           f(dart.as(keys[i], E));
           if (keys !== dart.dload(this[_map], '_keys')) {
             throw new core.ConcurrentModificationError(this[_map]);
           }
         }
       }
     }
     return HashMapKeyIterable;
   });
   let HashMapKeyIterable = HashMapKeyIterable$(dynamic);
@@ skipping 228 matching lines @@
       }
       [_newLinkedCell](key, value) {
         let cell = new LinkedHashMapCell(key, value);
         if (this[_first] === null) {
           this[_first] = this[_last] = cell;
         } else {
           let last = this[_last];
           cell[_previous] = last;
           this[_last] = last[_next] = cell;
         }
-        dart.notNull(this[_length])++;
+        this[_length] = dart.notNull(this[_length]) + 1;
         this[_modified]();
         return cell;
       }
       [_unlinkCell](cell) {
         let previous = cell[_previous];
         let next = cell[_next];
         if (previous === null) {
           dart.assert(dart.equals(cell, this[_first]));
           this[_first] = next;
         } else {
           previous[_next] = next;
         }
         if (next === null) {
           dart.assert(dart.equals(cell, this[_last]));
           this[_last] = previous;
         } else {
           next[_previous] = previous;
         }
-        dart.notNull(this[_length])--;
+        this[_length] = dart.notNull(this[_length]) - 1;
         this[_modified]();
       }
       static [_isStringKey](key) {
         return dart.notNull(typeof key == string) && dart.notNull(!dart.equals(key, '__proto__'));
       }
       static [_isNumericKey](key) {
         return dart.notNull(dart.is(key, core.num)) && (key & 0x3ffffff) === key;
       }
       [_computeHashCode](key) {
         return dart.dload(key, 'hashCode') & 0x3ffffff;
       }
       static [_getTableEntry](table, key) {
         return table[key];
       }
       static [_setTableEntry](table, key, value) {
         dart.assert(value !== null);
         table[key] = value;
       }
       static [_deleteTableEntry](table, key) {
         delete table[key];
       }
       [_getBucket](table, key) {
         let hash = this[_computeHashCode](key);
         return dart.as(table[hash], core.List);
       }
       [_findBucketIndex](bucket, key) {
         if (bucket === null)
           return -1;
         let length = bucket.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let cell = dart.as(bucket[i], LinkedHashMapCell);
           if (dart.equals(cell[_key], key))
             return i;
         }
         return -1;
       }
       static [_newHashTable]() {
         let table = Object.create(null);
         let temporaryKey = '<non-identifier-key>';
         _setTableEntry(table, temporaryKey, table);
         _deleteTableEntry(table, temporaryKey);
         return table;
       }
       toString() {
         return Maps.mapToString(this);
       }
     }
     return _LinkedHashMap;
   });
   let _LinkedHashMap = _LinkedHashMap$(dynamic, dynamic);
   let _LinkedIdentityHashMap$ = dart.generic(function(K, V) {
     class _LinkedIdentityHashMap extends _LinkedHashMap$(K, V) {
       [_computeHashCode](key) {
         return core.identityHashCode(key) & 0x3ffffff;
       }
       [_findBucketIndex](bucket, key) {
         if (bucket === null)
           return -1;
         let length = bucket.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let cell = dart.as(bucket[i], LinkedHashMapCell);
           if (core.identical(cell[_key], key))
             return i;
         }
         return -1;
       }
     }
     return _LinkedIdentityHashMap;
   });
   let _LinkedIdentityHashMap = _LinkedIdentityHashMap$(dynamic, dynamic);
@@ skipping 23 matching lines @@
           return null;
         return super._remove(key);
       }
       [_computeHashCode](key) {
         return this[_hashCode](dart.as(key, K)) & 0x3ffffff;
       }
       [_findBucketIndex](bucket, key) {
         if (bucket === null)
           return -1;
         let length = bucket.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let cell = dart.as(bucket[i], LinkedHashMapCell);
           if (this[_equals](dart.as(cell[_key], K), dart.as(key, K)))
             return i;
         }
         return -1;
       }
     }
     return _LinkedCustomHashMap;
   });
   let _LinkedCustomHashMap = _LinkedCustomHashMap$(dynamic, dynamic);
@@ skipping 156 matching lines @@
         let hash = this[_computeHashCode](element);
         let bucket = rest[hash];
         if (bucket === null) {
           _setTableEntry(rest, hash, [element]);
         } else {
           let index = this[_findBucketIndex](bucket, element);
           if (dart.notNull(index) >= 0)
             return false;
           bucket.push(element);
         }
-        dart.notNull(this[_length])++;
+        this[_length] = dart.notNull(this[_length]) + 1;
         this[_elements] = null;
         return true;
       }
       addAll(objects) {
         for (let each of objects) {
           this.add(each);
         }
       }
       remove(object) {
         if (_isStringElement(object)) {
           return this[_removeHashTableEntry](this[_strings], object);
         } else if (_isNumericElement(object)) {
           return this[_removeHashTableEntry](this[_nums], object);
         } else {
           return this[_remove](object);
         }
       }
       [_remove](object) {
         let rest = this[_rest];
         if (rest === null)
           return false;
         let bucket = this[_getBucket](rest, object);
         let index = this[_findBucketIndex](bucket, object);
         if (dart.notNull(index) < 0)
           return false;
-        dart.notNull(this[_length])--;
+        this[_length] = dart.notNull(this[_length]) - 1;
         this[_elements] = null;
         bucket.splice(index, 1);
         return true;
       }
       clear() {
         if (dart.notNull(this[_length]) > 0) {
           this[_strings] = this[_nums] = this[_rest] = this[_elements] = null;
           this[_length] = 0;
         }
       }
       [_computeElements]() {
         if (this[_elements] !== null)
           return this[_elements];
         let result = new core.List(this[_length]);
         let index = 0;
         let strings = this[_strings];
         if (strings !== null) {
           let names = Object.getOwnPropertyNames(strings);
           let entries = names.length;
-          for (let i = 0; dart.notNull(i) < dart.notNull(entries); dart.notNull(i)++) {
+          for (let i = 0; dart.notNull(i) < dart.notNull(entries); i = dart.notNull(i) + 1) {
             let element = names[i];
             result[index] = element;
-            dart.notNull(index)++;
+            index = dart.notNull(index) + 1;
           }
         }
         let nums = this[_nums];
         if (nums !== null) {
           let names = Object.getOwnPropertyNames(nums);
           let entries = names.length;
-          for (let i = 0; dart.notNull(i) < dart.notNull(entries); dart.notNull(i)++) {
+          for (let i = 0; dart.notNull(i) < dart.notNull(entries); i = dart.notNull(i) + 1) {
             let element = +names[i];
             result[index] = element;
-            dart.notNull(index)++;
+            index = dart.notNull(index) + 1;
           }
         }
         let rest = this[_rest];
         if (rest !== null) {
           let names = Object.getOwnPropertyNames(rest);
           let entries = names.length;
-          for (let i = 0; dart.notNull(i) < dart.notNull(entries); dart.notNull(i)++) {
+          for (let i = 0; dart.notNull(i) < dart.notNull(entries); i = dart.notNull(i) + 1) {
             let entry = names[i];
             let bucket = rest[entry];
             let length = bucket.length;
-            for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+            for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
               result[index] = bucket[i];
-              dart.notNull(index)++;
+              index = dart.notNull(index) + 1;
             }
           }
         }
         dart.assert(index === this[_length]);
         return this[_elements] = result;
       }
       [_addHashTableEntry](table, element) {
         if (_hasTableEntry(table, element))
           return false;
         _setTableEntry(table, element, 0);
-        dart.notNull(this[_length])++;
+        this[_length] = dart.notNull(this[_length]) + 1;
         this[_elements] = null;
         return true;
       }
       [_removeHashTableEntry](table, element) {
         if (dart.notNull(table !== null) && dart.notNull(_hasTableEntry(table, element))) {
           _deleteTableEntry(table, element);
-          dart.notNull(this[_length])--;
+          this[_length] = dart.notNull(this[_length]) - 1;
           this[_elements] = null;
           return true;
         } else {
           return false;
         }
       }
       static [_isStringElement](element) {
         return dart.notNull(typeof element == string) && dart.notNull(!dart.equals(element, '__proto__'));
       }
       static [_isNumericElement](element) {
@@ skipping 14 matching lines @@
         delete table[key];
       }
       [_getBucket](table, element) {
         let hash = this[_computeHashCode](element);
         return dart.as(table[hash], core.List);
       }
       [_findBucketIndex](bucket, element) {
         if (bucket === null)
           return -1;
         let length = bucket.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           if (dart.equals(bucket[i], element))
             return i;
         }
         return -1;
       }
       static [_newHashTable]() {
         let table = Object.create(null);
         let temporaryKey = '<non-identifier-key>';
         _setTableEntry(table, temporaryKey, table);
         _deleteTableEntry(table, temporaryKey);
         return table;
       }
     }
     return _HashSet;
   });
   let _HashSet = _HashSet$(dynamic);
   let _IdentityHashSet$ = dart.generic(function(E) {
     class _IdentityHashSet extends _HashSet$(E) {
       [_newSet]() {
         return new _IdentityHashSet();
       }
       [_computeHashCode](key) {
         return core.identityHashCode(key) & 0x3ffffff;
       }
       [_findBucketIndex](bucket, element) {
         if (bucket === null)
           return -1;
         let length = bucket.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           if (core.identical(bucket[i], element))
             return i;
         }
         return -1;
       }
     }
     return _IdentityHashSet;
   });
   let _IdentityHashSet = _IdentityHashSet$(dynamic);
   let _equality = Symbol('_equality');
   let _hasher = Symbol('_hasher');
   let _CustomHashSet$ = dart.generic(function(E) {
     class _CustomHashSet extends _HashSet$(E) {
       _CustomHashSet($_equality, $_hasher, validKey) {
         this[_equality] = $_equality;
         this[_hasher] = $_hasher;
         this[_validKey] = dart.as(validKey !== null ? validKey : (x) => dart.is(x, E), _Predicate);
         super._HashSet();
       }
       [_newSet]() {
         return new _CustomHashSet(this[_equality], this[_hasher], this[_validKey]);
       }
       [_findBucketIndex](bucket, element) {
         if (bucket === null)
           return -1;
         let length = bucket.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           if (this[_equality](dart.as(bucket[i], E), dart.as(element, E)))
             return i;
         }
         return -1;
       }
       [_computeHashCode](element) {
         return this[_hasher](dart.as(element, E)) & 0x3ffffff;
       }
       add(object) {
         return super._add(object);
@@ skipping 245 matching lines @@
       }
       [_newLinkedCell](element) {
         let cell = new LinkedHashSetCell(element);
         if (this[_first] === null) {
           this[_first] = this[_last] = cell;
         } else {
           let last = this[_last];
           cell[_previous] = last;
           this[_last] = last[_next] = cell;
         }
-        dart.notNull(this[_length])++;
+        this[_length] = dart.notNull(this[_length]) + 1;
         this[_modified]();
         return cell;
       }
       [_unlinkCell](cell) {
         let previous = cell[_previous];
         let next = cell[_next];
         if (previous === null) {
           dart.assert(dart.equals(cell, this[_first]));
           this[_first] = next;
         } else {
           previous[_next] = next;
         }
         if (next === null) {
           dart.assert(dart.equals(cell, this[_last]));
           this[_last] = previous;
         } else {
           next[_previous] = previous;
         }
-        dart.notNull(this[_length])--;
+        this[_length] = dart.notNull(this[_length]) - 1;
         this[_modified]();
       }
       static [_isStringElement](element) {
         return dart.notNull(typeof element == string) && dart.notNull(!dart.equals(element, '__proto__'));
       }
       static [_isNumericElement](element) {
         return dart.notNull(dart.is(element, core.num)) && (element & 0x3ffffff) === element;
       }
       [_computeHashCode](element) {
         return dart.dload(element, 'hashCode') & 0x3ffffff;
       }
       static [_getTableEntry](table, key) {
         return table[key];
       }
       static [_setTableEntry](table, key, value) {
         dart.assert(value !== null);
         table[key] = value;
       }
       static [_deleteTableEntry](table, key) {
         delete table[key];
       }
       [_getBucket](table, element) {
         let hash = this[_computeHashCode](element);
         return dart.as(table[hash], core.List);
       }
       [_findBucketIndex](bucket, element) {
         if (bucket === null)
           return -1;
         let length = bucket.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let cell = dart.as(bucket[i], LinkedHashSetCell);
           if (dart.equals(cell[_element], element))
             return i;
         }
         return -1;
       }
       static [_newHashTable]() {
         let table = Object.create(null);
         let temporaryKey = '<non-identifier-key>';
         _setTableEntry(table, temporaryKey, table);
         _deleteTableEntry(table, temporaryKey);
         return table;
       }
     }
     return _LinkedHashSet;
   });
   let _LinkedHashSet = _LinkedHashSet$(dynamic);
   let _LinkedIdentityHashSet$ = dart.generic(function(E) {
     class _LinkedIdentityHashSet extends _LinkedHashSet$(E) {
       [_newSet]() {
         return new _LinkedIdentityHashSet();
       }
       [_computeHashCode](key) {
         return core.identityHashCode(key) & 0x3ffffff;
       }
       [_findBucketIndex](bucket, element) {
         if (bucket === null)
           return -1;
         let length = bucket.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let cell = dart.as(bucket[i], LinkedHashSetCell);
           if (core.identical(cell[_element], element))
             return i;
         }
         return -1;
       }
     }
     return _LinkedIdentityHashSet;
   });
   let _LinkedIdentityHashSet = _LinkedIdentityHashSet$(dynamic);
   let _LinkedCustomHashSet$ = dart.generic(function(E) {
     class _LinkedCustomHashSet extends _LinkedHashSet$(E) {
       _LinkedCustomHashSet($_equality, $_hasher, validKey) {
         this[_equality] = $_equality;
         this[_hasher] = $_hasher;
         this[_validKey] = dart.as(validKey !== null ? validKey : (x) => dart.is(x, E), _Predicate);
         super._LinkedHashSet();
       }
       [_newSet]() {
         return new _LinkedCustomHashSet(this[_equality], this[_hasher], this[_validKey]);
       }
       [_findBucketIndex](bucket, element) {
         if (bucket === null)
           return -1;
         let length = bucket.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let cell = dart.as(bucket[i], LinkedHashSetCell);
           if (this[_equality](dart.as(cell[_element], E), dart.as(element, E)))
             return i;
         }
         return -1;
       }
       [_computeHashCode](element) {
         return this[_hasher](dart.as(element, E)) & 0x3ffffff;
       }
       add(element) {
@@ skipping 303 matching lines @@
         return new core.List.from(this, {growable: growable});
       }
       toSet() {
         return new core.Set.from(this);
       }
       get length() {
         dart.assert(!dart.is(this, _internal.EfficientLength));
         let count = 0;
         let it = this.iterator;
         while (it.moveNext()) {
-          dart.notNull(count)++;
+          count = dart.notNull(count) + 1;
         }
         return count;
       }
       get isEmpty() {
         return !dart.notNull(this.iterator.moveNext());
       }
       get isNotEmpty() {
         return !dart.notNull(this.isEmpty);
       }
       take(n) {
@@ skipping 78 matching lines @@
         throw _internal.IterableElementError.noElement();
       }
       elementAt(index) {
         if (!(typeof index == number))
           throw new core.ArgumentError.notNull("index");
         core.RangeError.checkNotNegative(index, "index");
         let elementIndex = 0;
         for (let element of this) {
           if (index === elementIndex)
             return element;
-          dart.notNull(elementIndex)++;
+          elementIndex = dart.notNull(elementIndex) + 1;
         }
         throw new core.RangeError.index(index, this, "index", null, elementIndex);
       }
       toString() {
         return IterableBase.iterableToShortString(this, '(', ')');
       }
     }
     return IterableMixin;
   });
   let IterableMixin = IterableMixin$(dynamic);
@@ skipping 79 matching lines @@
         return new core.List.from(this, {growable: growable});
       }
       toSet() {
         return new core.Set.from(this);
       }
       get length() {
         dart.assert(!dart.is(this, _internal.EfficientLength));
         let count = 0;
         let it = this.iterator;
         while (it.moveNext()) {
-          dart.notNull(count)++;
+          count = dart.notNull(count) + 1;
         }
         return count;
       }
       get isEmpty() {
         return !dart.notNull(this.iterator.moveNext());
       }
       get isNotEmpty() {
         return !dart.notNull(this.isEmpty);
       }
       take(n) {
@@ skipping 78 matching lines @@
         throw _internal.IterableElementError.noElement();
       }
       elementAt(index) {
         if (!(typeof index == number))
           throw new core.ArgumentError.notNull("index");
         core.RangeError.checkNotNegative(index, "index");
         let elementIndex = 0;
         for (let element of this) {
           if (index === elementIndex)
             return element;
-          dart.notNull(elementIndex)++;
+          elementIndex = dart.notNull(elementIndex) + 1;
         }
         throw new core.RangeError.index(index, this, "index", null, elementIndex);
       }
       toString() {
         return iterableToShortString(this, '(', ')');
       }
       static iterableToShortString(iterable, leftDelimiter, rightDelimiter) {
         if (leftDelimiter === void 0)
           leftDelimiter = '(';
         if (rightDelimiter === void 0)
@@ skipping 31 matching lines @@
         try {
           buffer.writeAll(iterable, ", ");
         } finally {
           dart.assert(core.identical(_toStringVisiting.last, iterable));
           _toStringVisiting.removeLast();
         }
         buffer.write(rightDelimiter);
         return buffer.toString();
       }
       static [_isToStringVisiting](o) {
-        for (let i = 0; dart.notNull(i) < dart.notNull(_toStringVisiting.length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(_toStringVisiting.length); i = dart.notNull(i) + 1) {
           if (core.identical(o, _toStringVisiting.get(i)))
             return true;
         }
         return false;
       }
       static [_iterablePartsToStrings](iterable, parts) {
         let LENGTH_LIMIT = 80;
         let HEAD_COUNT = 3;
         let TAIL_COUNT = 2;
         let MAX_COUNT = 100;
         let OVERHEAD = 2;
         let ELLIPSIS_SIZE = 3;
         let length = 0;
         let count = 0;
         let it = iterable.iterator;
         while (dart.notNull(length) < dart.notNull(LENGTH_LIMIT) || dart.notNull(count) < dart.notNull(HEAD_COUNT)) {
           if (!dart.notNull(it.moveNext()))
             return;
           let next = `${it.current}`;
           parts.add(next);
           length = dart.notNull(next.length) + dart.notNull(OVERHEAD);
-          dart.notNull(count)++;
+          count = dart.notNull(count) + 1;
         }
         let penultimateString = null;
         let ultimateString = null;
         let penultimate = null;
         let ultimate = null;
         if (!dart.notNull(it.moveNext())) {
           if (dart.notNull(count) <= dart.notNull(HEAD_COUNT) + dart.notNull(TAIL_COUNT))
             return;
           ultimateString = dart.as(parts.removeLast(), core.String);
           penultimateString = dart.as(parts.removeLast(), core.String);
         } else {
           penultimate = it.current;
-          dart.notNull(count)++;
+          count = dart.notNull(count) + 1;
           if (!dart.notNull(it.moveNext())) {
             if (dart.notNull(count) <= dart.notNull(HEAD_COUNT) + 1) {
               parts.add(`${penultimate}`);
               return;
             }
             ultimateString = `${penultimate}`;
             penultimateString = dart.as(parts.removeLast(), core.String);
             length = dart.notNull(ultimateString.length) + dart.notNull(OVERHEAD);
           } else {
             ultimate = it.current;
-            dart.notNull(count)++;
+            count = dart.notNull(count) + 1;
             dart.assert(dart.notNull(count) < dart.notNull(MAX_COUNT));
             while (it.moveNext()) {
               penultimate = ultimate;
               ultimate = it.current;
-              dart.notNull(count)++;
+              count = dart.notNull(count) + 1;
               if (dart.notNull(count) > dart.notNull(MAX_COUNT)) {
                 while (dart.notNull(length) > dart.notNull(LENGTH_LIMIT) - dart.notNull(ELLIPSIS_SIZE) - dart.notNull(OVERHEAD) && dart.notNull(count) > dart.notNull(HEAD_COUNT)) {
                   length = dart.as(dart.dbinary(dart.dload(parts.removeLast(), 'length'), '+', OVERHEAD), core.int);
-                  dart.notNull(count)--;
+                  count = dart.notNull(count) - 1;
                 }
                 parts.add("...");
                 return;
               }
             }
             penultimateString = `${penultimate}`;
             ultimateString = `${ultimate}`;
             length = dart.notNull(ultimateString.length) + dart.notNull(penultimateString.length) + 2 * dart.notNull(OVERHEAD);
           }
         }
@@ skipping 203 matching lines @@
         this[_unlink](entry);
         return true;
       }
       get iterator() {
         return new _LinkedListIterator(this);
       }
       get length() {
         return this[_length];
       }
       clear() {
-        dart.notNull(this[_modificationCount])++;
+        this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
         let next = this[_next];
         while (!dart.notNull(core.identical(next, this))) {
           let entry = dart.as(next, E);
           next = entry[_next];
           entry[_next] = entry[_previous] = entry[_list] = null;
         }
         this[_next] = this[_previous] = this;
         this[_length] = 0;
       }
       get first() {
@@ skipping 28 matching lines @@
           current = current[_next];
         }
       }
       get isEmpty() {
         return this[_length] === 0;
       }
       [_insertAfter](entry, newEntry) {
         if (newEntry.list !== null) {
           throw new core.StateError('LinkedListEntry is already in a LinkedList');
         }
-        dart.notNull(this[_modificationCount])++;
+        this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
         newEntry[_list] = this;
         let predecessor = entry;
         let successor = entry[_next];
         successor[_previous] = newEntry;
         newEntry[_previous] = predecessor;
         newEntry[_next] = successor;
         predecessor[_next] = newEntry;
-        dart.notNull(this[_length])++;
+        this[_length] = dart.notNull(this[_length]) + 1;
       }
       [_unlink](entry) {
-        dart.notNull(this[_modificationCount])++;
+        this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
         entry[_next][_previous] = entry[_previous];
         entry[_previous][_next] = entry[_next];
-        dart.notNull(this[_length])--;
+        this[_length] = dart.notNull(this[_length]) - 1;
         entry[_list] = entry[_next] = entry[_previous] = null;
       }
     }
     return LinkedList;
   });
   let LinkedList = LinkedList$(dynamic);
   let _LinkedListIterator$ = dart.generic(function(E) {
     class _LinkedListIterator extends dart.Object {
       _LinkedListIterator(list) {
         this[_list] = list;
@@ skipping 73 matching lines @@
   let ListMixin$ = dart.generic(function(E) {
     class ListMixin extends dart.Object {
       get iterator() {
         return new _internal.ListIterator(this);
       }
       elementAt(index) {
         return this.get(index);
       }
       forEach(action) {
         let length = this.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           action(this.get(i));
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
       }
       get isEmpty() {
         return this.length === 0;
       }
       get isNotEmpty() {
@@ skipping 11 matching lines @@
       }
       get single() {
         if (this.length === 0)
           throw _internal.IterableElementError.noElement();
         if (dart.notNull(this.length) > 1)
           throw _internal.IterableElementError.tooMany();
         return this.get(0);
       }
       contains(element) {
         let length = this.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(this.length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(this.length); i = dart.notNull(i) + 1) {
           if (dart.equals(this.get(i), element))
             return true;
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         return false;
       }
       every(test) {
         let length = this.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           if (!dart.notNull(test(this.get(i))))
             return false;
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         return true;
       }
       any(test) {
         let length = this.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           if (test(this.get(i)))
             return true;
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         return false;
       }
       firstWhere(test, opt$) {
         let orElse = opt$.orElse === void 0 ? null : opt$.orElse;
         let length = this.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let element = this.get(i);
           if (test(element))
             return element;
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         if (orElse !== null)
           return orElse();
         throw _internal.IterableElementError.noElement();
       }
       lastWhere(test, opt$) {
         let orElse = opt$.orElse === void 0 ? null : opt$.orElse;
         let length = this.length;
-        for (let i = dart.notNull(length) - 1; dart.notNull(i) >= 0; dart.notNull(i)--) {
+        for (let i = dart.notNull(length) - 1; dart.notNull(i) >= 0; i = dart.notNull(i) - 1) {
           let element = this.get(i);
           if (test(element))
             return element;
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         if (orElse !== null)
           return orElse();
         throw _internal.IterableElementError.noElement();
       }
       singleWhere(test) {
         let length = this.length;
         let match = null;
         let matchFound = false;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let element = this.get(i);
           if (test(element)) {
             if (matchFound) {
               throw _internal.IterableElementError.tooMany();
             }
             matchFound = true;
             match = element;
           }
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
@@ skipping 19 matching lines @@
         return new _internal.MappedListIterable(this, dart.as(f, dart.throw_("Unimplemented type (dynamic) → dynamic")));
       }
       expand(f) {
         return new _internal.ExpandIterable(this, f);
       }
       reduce(combine) {
         let length = this.length;
         if (length === 0)
           throw _internal.IterableElementError.noElement();
         let value = this.get(0);
-        for (let i = 1; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 1; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           value = combine(value, this.get(i));
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         return value;
       }
       fold(initialValue, combine) {
         let value = initialValue;
         let length = this.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           value = combine(value, this.get(i));
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         return value;
       }
       skip(count) {
         return new _internal.SubListIterable(this, count, null);
       }
@@ skipping 10 matching lines @@
         let growable = opt$.growable === void 0 ? true : opt$.growable;
         let result = null;
         if (growable) {
           result = ((_) => {
             _.length = this.length;
             return _;
           }).bind(this)(new core.List());
         } else {
           result = new core.List(this.length);
         }
-        for (let i = 0; dart.notNull(i) < dart.notNull(this.length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(this.length); i = dart.notNull(i) + 1) {
           result.set(i, this.get(i));
         }
         return result;
       }
       toSet() {
         let result = new core.Set();
-        for (let i = 0; dart.notNull(i) < dart.notNull(this.length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(this.length); i = dart.notNull(i) + 1) {
           result.add(this.get(i));
         }
         return result;
       }
       add(element) {
-        this.set(dart.notNull(this.length)++, element);
+        this.set((($tmp) => this.length = dart.notNull($tmp) + 1, $tmp).bind(this)(this.length), element);
       }
       addAll(iterable) {
         for (let element of iterable) {
-          this.set(dart.notNull(this.length)++, element);
+          this.set((($tmp) => this.length = dart.notNull($tmp) + 1, $tmp).bind(this)(this.length), element);
         }
       }
       remove(element) {
-        for (let i = 0; dart.notNull(i) < dart.notNull(this.length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(this.length); i = dart.notNull(i) + 1) {
           if (dart.equals(this.get(i), element)) {
             this.setRange(i, dart.notNull(this.length) - 1, this, dart.notNull(i) + 1);
             this.length = 1;
             return true;
           }
         }
         return false;
       }
       removeWhere(test) {
         _filter(this, dart.as(test, dart.throw_("Unimplemented type (dynamic) → bool")), false);
       }
       retainWhere(test) {
         _filter(this, dart.as(test, dart.throw_("Unimplemented type (dynamic) → bool")), true);
       }
       static [_filter](source, test, retainMatching) {
         let retained = new List.from([]);
         let length = source.length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let element = source.get(i);
           if (test(element) === retainMatching) {
             retained.add(element);
           }
           if (length !== source.length) {
             throw new core.ConcurrentModificationError(source);
           }
         }
         if (retained.length !== source.length) {
           source.setRange(0, retained.length, retained);
           source.length = retained.length;
         }
       }
       clear() {
         this.length = 0;
       }
       removeLast() {
         if (this.length === 0) {
           throw _internal.IterableElementError.noElement();
         }
         let result = this.get(dart.notNull(this.length) - 1);
-        dart.notNull(this.length)--;
+        this.length = dart.notNull(this.length) - 1;
         return result;
       }
       sort(compare) {
         if (compare === void 0)
           compare = null;
         if (compare === null) {
           let defaultCompare = core.Comparable.compare;
           compare = defaultCompare;
         }
         _internal.Sort.sort(this, dart.as(compare, dart.throw_("Unimplemented type (dynamic, dynamic) → int")));
@@ skipping 18 matching lines @@
       sublist(start, end) {
         if (end === void 0)
           end = null;
         let listLength = this.length;
         if (end === null)
           end = listLength;
         core.RangeError.checkValidRange(start, end, listLength);
         let length = dart.notNull(end) - dart.notNull(start);
         let result = new core.List();
         result.length = length;
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           result.set(i, this.get(dart.notNull(start) + dart.notNull(i)));
         }
         return result;
       }
       getRange(start, end) {
         core.RangeError.checkValidRange(start, end, this.length);
         return new _internal.SubListIterable(this, start, end);
       }
       removeRange(start, end) {
         core.RangeError.checkValidRange(start, end, this.length);
         let length = dart.notNull(end) - dart.notNull(start);
         this.setRange(start, dart.notNull(this.length) - dart.notNull(length), this, end);
         this.length = length;
       }
       fillRange(start, end, fill) {
         if (fill === void 0)
           fill = null;
         core.RangeError.checkValidRange(start, end, this.length);
-        for (let i = start; dart.notNull(i) < dart.notNull(end); dart.notNull(i)++) {
+        for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
           this.set(i, fill);
         }
       }
       setRange(start, end, iterable, skipCount) {
         if (skipCount === void 0)
           skipCount = 0;
         core.RangeError.checkValidRange(start, end, this.length);
         let length = dart.notNull(end) - dart.notNull(start);
         if (length === 0)
           return;
         core.RangeError.checkNotNegative(skipCount, "skipCount");
         let otherList = null;
         let otherStart = null;
         if (dart.is(iterable, core.List)) {
           otherList = dart.as(iterable, core.List);
           otherStart = skipCount;
         } else {
           otherList = iterable.skip(skipCount).toList({growable: false});
           otherStart = 0;
         }
         if (dart.notNull(otherStart) + dart.notNull(length) > dart.notNull(otherList.length)) {
           throw _internal.IterableElementError.tooFew();
         }
         if (dart.notNull(otherStart) < dart.notNull(start)) {
-          for (let i = dart.notNull(length) - 1; dart.notNull(i) >= 0; dart.notNull(i)--) {
+          for (let i = dart.notNull(length) - 1; dart.notNull(i) >= 0; i = dart.notNull(i) - 1) {
             this.set(dart.notNull(start) + dart.notNull(i), dart.as(otherList.get(dart.notNull(otherStart) + dart.notNull(i)), E));
           }
         } else {
-          for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+          for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
             this.set(dart.notNull(start) + dart.notNull(i), dart.as(otherList.get(dart.notNull(otherStart) + dart.notNull(i)), E));
           }
         }
       }
       replaceRange(start, end, newContents) {
         core.RangeError.checkValidRange(start, end, this.length);
         if (!dart.is(newContents, _internal.EfficientLength)) {
           newContents = newContents.toList();
         }
         let removeLength = dart.notNull(end) - dart.notNull(start);
@@ skipping 18 matching lines @@
       }
       indexOf(element, startIndex) {
         if (startIndex === void 0)
           startIndex = 0;
         if (dart.notNull(startIndex) >= dart.notNull(this.length)) {
           return -1;
         }
         if (dart.notNull(startIndex) < 0) {
           startIndex = 0;
         }
-        for (let i = startIndex; dart.notNull(i) < dart.notNull(this.length); dart.notNull(i)++) {
+        for (let i = startIndex; dart.notNull(i) < dart.notNull(this.length); i = dart.notNull(i) + 1) {
           if (dart.equals(this.get(i), element)) {
             return i;
           }
         }
         return -1;
       }
       lastIndexOf(element, startIndex) {
         if (startIndex === void 0)
           startIndex = null;
         if (startIndex === null) {
           startIndex = dart.notNull(this.length) - 1;
         } else {
           if (dart.notNull(startIndex) < 0) {
             return -1;
           }
           if (dart.notNull(startIndex) >= dart.notNull(this.length)) {
             startIndex = dart.notNull(this.length) - 1;
           }
         }
-        for (let i = startIndex; dart.notNull(i) >= 0; dart.notNull(i)--) {
+        for (let i = startIndex; dart.notNull(i) >= 0; i = dart.notNull(i) - 1) {
           if (dart.equals(this.get(i), element)) {
             return i;
           }
         }
         return -1;
       }
       insert(index, element) {
         core.RangeError.checkValueInInterval(index, 0, this.length, "index");
         if (index === this.length) {
           this.add(element);
           return;
         }
         if (!(typeof index == number))
           throw new core.ArgumentError(index);
-        dart.notNull(this.length)++;
+        this.length = dart.notNull(this.length) + 1;
         this.setRange(dart.notNull(index) + 1, this.length, this, index);
         this.set(index, element);
       }
       removeAt(index) {
         let result = this.get(index);
         this.setRange(index, dart.notNull(this.length) - 1, this, dart.notNull(index) + 1);
-        dart.notNull(this.length)--;
+        this.length = dart.notNull(this.length) - 1;
         return result;
       }
       insertAll(index, iterable) {
         core.RangeError.checkValueInInterval(index, 0, this.length, "index");
         if (dart.is(iterable, _internal.EfficientLength)) {
           iterable = iterable.toList();
         }
         let insertionLength = iterable.length;
         this.length = insertionLength;
         this.setRange(dart.notNull(index) + dart.notNull(insertionLength), this.length, this, index);
         this.setAll(index, iterable);
       }
       setAll(index, iterable) {
         if (dart.is(iterable, core.List)) {
           this.setRange(index, dart.notNull(index) + dart.notNull(iterable.length), iterable);
         } else {
           for (let element of iterable) {
-            this.set(dart.notNull(index)++, element);
+            this.set((($tmp) => index = dart.notNull($tmp) + 1, $tmp)(index), element);
           }
         }
       }
       get reversed() {
         return new _internal.ReversedListIterable(this);
       }
       toString() {
         return IterableBase.iterableToFullString(this, '[', ']');
       }
     }
@@ skipping 393 matching lines @@
         for (let e of elements) {
           list.addLast(e);
         }
         return dart.as(list, DoubleLinkedQueue$(E));
       }
       get length() {
         return this[_elementCount];
       }
       addLast(value) {
         this[_sentinel].prepend(value);
-        dart.notNull(this[_elementCount])++;
+        this[_elementCount] = dart.notNull(this[_elementCount]) + 1;
       }
       addFirst(value) {
         this[_sentinel].append(value);
-        dart.notNull(this[_elementCount])++;
+        this[_elementCount] = dart.notNull(this[_elementCount]) + 1;
       }
       add(value) {
         this[_sentinel].prepend(value);
-        dart.notNull(this[_elementCount])++;
+        this[_elementCount] = dart.notNull(this[_elementCount]) + 1;
       }
       addAll(iterable) {
         for (let value of iterable) {
           this[_sentinel].prepend(value);
-          dart.notNull(this[_elementCount])++;
+          this[_elementCount] = dart.notNull(this[_elementCount]) + 1;
         }
       }
       removeLast() {
         let result = this[_sentinel][_previous].remove();
-        dart.notNull(this[_elementCount])--;
+        this[_elementCount] = dart.notNull(this[_elementCount]) - 1;
         return result;
       }
       removeFirst() {
         let result = this[_sentinel][_next].remove();
-        dart.notNull(this[_elementCount])--;
+        this[_elementCount] = dart.notNull(this[_elementCount]) - 1;
         return result;
       }
       remove(o) {
         let entry = this[_sentinel][_next];
         while (!dart.notNull(core.identical(entry, this[_sentinel]))) {
           if (dart.equals(entry.element, o)) {
             entry.remove();
-            dart.notNull(this[_elementCount])--;
+            this[_elementCount] = dart.notNull(this[_elementCount]) - 1;
             return true;
           }
           entry = entry[_next];
         }
         return false;
       }
       [_filter](test, removeMatching) {
         let entry = this[_sentinel][_next];
         while (!dart.notNull(core.identical(entry, this[_sentinel]))) {
           let next = entry[_next];
           if (core.identical(removeMatching, test(entry.element))) {
             entry.remove();
-            dart.notNull(this[_elementCount])--;
+            this[_elementCount] = dart.notNull(this[_elementCount]) - 1;
           }
           entry = next;
         }
       }
       removeWhere(test) {
         this[_filter](test, true);
       }
       retainWhere(test) {
         this[_filter](test, false);
       }
@@ skipping 183 matching lines @@
             if (dart.notNull(addCount) < dart.notNull(endSpace)) {
               this[_table].setRange(this[_tail], dart.notNull(this[_tail]) + dart.notNull(addCount), dart.as(list, core.Iterable$(E)), 0);
               this[_tail] = addCount;
             } else {
               let preSpace = dart.notNull(addCount) - dart.notNull(endSpace);
               this[_table].setRange(this[_tail], dart.notNull(this[_tail]) + dart.notNull(endSpace), dart.as(list, core.Iterable$(E)), 0);
               this[_table].setRange(0, preSpace, dart.as(list, core.Iterable$(E)), endSpace);
               this[_tail] = preSpace;
             }
           }
-          dart.notNull(this[_modificationCount])++;
+          this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
         } else {
           for (let element of elements)
             this[_add](element);
         }
       }
       remove(object) {
         for (let i = this[_head]; i !== this[_tail]; i = dart.notNull(i) + 1 & dart.notNull(this[_table].length) - 1) {
           let element = this[_table].get(i);
           if (dart.equals(element, object)) {
             this[_remove](i);
-            dart.notNull(this[_modificationCount])++;
+            this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
             return true;
           }
         }
         return false;
       }
       [_filterWhere](test, removeMatching) {
         let index = this[_head];
         let modificationCount = this[_modificationCount];
         let i = this[_head];
         while (i !== this[_tail]) {
           let element = this[_table].get(i);
           let remove = core.identical(removeMatching, test(element));
           this[_checkModification](modificationCount);
           if (remove) {
             i = this[_remove](i);
-            modificationCount = ++dart.notNull(this[_modificationCount]);
+            modificationCount = this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
           } else {
             i = dart.notNull(i) + 1 & dart.notNull(this[_table].length) - 1;
           }
         }
       }
       removeWhere(test) {
         this[_filterWhere](test, true);
       }
       retainWhere(test) {
         this[_filterWhere](test, false);
       }
       clear() {
         if (this[_head] !== this[_tail]) {
           for (let i = this[_head]; i !== this[_tail]; i = dart.notNull(i) + 1 & dart.notNull(this[_table].length) - 1) {
             this[_table].set(i, null);
           }
           this[_head] = this[_tail] = 0;
-          dart.notNull(this[_modificationCount])++;
+          this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
         }
       }
       toString() {
         return IterableBase.iterableToFullString(this, "{", "}");
       }
       addLast(element) {
         this[_add](element);
       }
       addFirst(element) {
         this[_head] = dart.notNull(this[_head]) - 1 & dart.notNull(this[_table].length) - 1;
         this[_table].set(this[_head], element);
         if (this[_head] === this[_tail])
           this[_grow]();
-        dart.notNull(this[_modificationCount])++;
+        this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
       }
       removeFirst() {
         if (this[_head] === this[_tail])
           throw _internal.IterableElementError.noElement();
-        dart.notNull(this[_modificationCount])++;
+        this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
         let result = this[_table].get(this[_head]);
         this[_table].set(this[_head], null);
         this[_head] = dart.notNull(this[_head]) + 1 & dart.notNull(this[_table].length) - 1;
         return result;
       }
       removeLast() {
         if (this[_head] === this[_tail])
           throw _internal.IterableElementError.noElement();
-        dart.notNull(this[_modificationCount])++;
+        this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
         this[_tail] = dart.notNull(this[_tail]) - 1 & dart.notNull(this[_table].length) - 1;
         let result = this[_table].get(this[_tail]);
         this[_table].set(this[_tail], null);
         return result;
       }
       static [_isPowerOf2](number) {
         return (dart.notNull(number) & dart.notNull(number) - 1) === 0;
       }
       static [_nextPowerOf2](number) {
         dart.assert(dart.notNull(number) > 0);
         number = (dart.notNull(number) << 1) - 1;
         for (;;) {
           let nextNumber = dart.notNull(number) & dart.notNull(number) - 1;
           if (nextNumber === 0)
             return number;
           number = nextNumber;
         }
       }
       [_checkModification](expectedModificationCount) {
         if (expectedModificationCount !== this[_modificationCount]) {
           throw new core.ConcurrentModificationError(this);
         }
       }
       [_add](element) {
         this[_table].set(this[_tail], element);
         this[_tail] = dart.notNull(this[_tail]) + 1 & dart.notNull(this[_table].length) - 1;
         if (this[_head] === this[_tail])
           this[_grow]();
-        dart.notNull(this[_modificationCount])++;
+        this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
       }
       [_remove](offset) {
         let mask = dart.notNull(this[_table].length) - 1;
         let startDistance = dart.notNull(offset) - dart.notNull(this[_head]) & dart.notNull(mask);
         let endDistance = dart.notNull(this[_tail]) - dart.notNull(offset) & dart.notNull(mask);
         if (dart.notNull(startDistance) < dart.notNull(endDistance)) {
           let i = offset;
           while (i !== this[_head]) {
             let prevOffset = dart.notNull(i) - 1 & dart.notNull(mask);
             this[_table].set(i, this[_table].get(prevOffset));
@@ skipping 152 matching lines @@
         return result;
       }
       toList(opt$) {
         let growable = opt$.growable === void 0 ? true : opt$.growable;
         let result = growable ? ((_) => {
           _.length = this.length;
           return _;
         }).bind(this)(new core.List()) : new core.List(this.length);
         let i = 0;
         for (let element of this)
-          result.set(dart.notNull(i)++, element);
+          result.set((($tmp) => i = dart.notNull($tmp) + 1, $tmp)(i), element);
         return result;
       }
       map(f) {
         return new _internal.EfficientLengthMappedIterable(this, f);
       }
       get single() {
         if (dart.notNull(this.length) > 1)
           throw _internal.IterableElementError.tooMany();
         let it = this.iterator;
         if (!dart.notNull(it.moveNext()))
@@ skipping 138 matching lines @@
         throw _internal.IterableElementError.noElement();
       }
       elementAt(index) {
         if (!(typeof index == number))
           throw new core.ArgumentError.notNull("index");
         core.RangeError.checkNotNegative(index, "index");
         let elementIndex = 0;
         for (let element of this) {
           if (index === elementIndex)
             return element;
-          dart.notNull(elementIndex)++;
+          elementIndex = dart.notNull(elementIndex) + 1;
         }
         throw new core.RangeError.index(index, this, "index", null, elementIndex);
       }
     }
     return SetMixin;
   });
   let SetMixin = SetMixin$(dynamic);
   let SetBase$ = dart.generic(function(E) {
     class SetBase extends SetMixin$(E) {
       static setToString(set) {
@@ skipping 86 matching lines @@
             break;
           }
         }
         left.right = current.left;
         right.left = current.right;
         current.left = this[_dummy].right;
         current.right = this[_dummy].left;
         this[_root] = current;
         this[_dummy].right = null;
         this[_dummy].left = null;
-        dart.notNull(this[_splayCount])++;
+        this[_splayCount] = dart.notNull(this[_splayCount]) + 1;
         return comp;
       }
       [_splayMin](node) {
         let current = node;
         while (current.left !== null) {
           let left = current.left;
           current.left = left.right;
           left.right = current;
           current = left;
         }
         return dart.as(current, _SplayTreeNode$(K));
       }
       [_splayMax](node) {
         let current = node;
         while (current.right !== null) {
           let right = current.right;
           current.right = right.left;
           right.left = current;
           current = right;
         }
         return dart.as(current, _SplayTreeNode$(K));
       }
       [_remove](key) {
         if (this[_root] === null)
           return null;
         let comp = this[_splay](key);
         if (comp !== 0)
           return null;
         let result = this[_root];
-        dart.notNull(this[_count])--;
+        this[_count] = dart.notNull(this[_count]) - 1;
         if (this[_root].left === null) {
           this[_root] = this[_root].right;
         } else {
           let right = this[_root].right;
           this[_root] = this[_splayMax](this[_root].left);
           this[_root].right = right;
         }
-        dart.notNull(this[_modificationCount])++;
+        this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
         return result;
       }
       [_addNewRoot](node, comp) {
-        dart.notNull(this[_count])++;
-        dart.notNull(this[_modificationCount])++;
+        this[_count] = dart.notNull(this[_count]) + 1;
+        this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
         if (this[_root] === null) {
           this[_root] = node;
           return;
         }
         if (dart.notNull(comp) < 0) {
           node.left = this[_root];
           node.right = this[_root].right;
           this[_root].right = null;
         } else {
           node.right = this[_root];
@@ skipping 10 matching lines @@
       }
       get [_last]() {
         if (this[_root] === null)
           return null;
         this[_root] = this[_splayMax](this[_root]);
         return this[_root];
       }
       [_clear]() {
         this[_root] = null;
         this[_count] = 0;
-        dart.notNull(this[_modificationCount])++;
+        this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
       }
     }
     return _SplayTree;
   });
   let _SplayTree = _SplayTree$(dynamic);
   let _TypeTest$ = dart.generic(function(T) {
     class _TypeTest extends dart.Object {
       test(v) {
         return dart.is(v, T);
       }
@@ skipping 459 matching lines @@
         for (let object of elements) {
           if (modificationCount !== this[_modificationCount]) {
             throw new core.ConcurrentModificationError(this);
           }
           if (dart.notNull(this[_validKey](object)) && this[_splay](dart.as(object, E)) === 0)
             retainSet.add(this[_root].key);
         }
         if (retainSet[_count] !== this[_count]) {
           this[_root] = retainSet[_root];
           this[_count] = retainSet[_count];
-          dart.notNull(this[_modificationCount])++;
+          this[_modificationCount] = dart.notNull(this[_modificationCount]) + 1;
         }
       }
       lookup(object) {
         if (!dart.notNull(this[_validKey](object)))
           return null;
         let comp = this[_splay](dart.as(object, E));
         if (comp !== 0)
           return null;
         return this[_root].key;
       }
@@ skipping 108 matching lines @@
   exports.ListQueue$ = ListQueue$;
   exports.SetMixin = SetMixin;
   exports.SetMixin$ = SetMixin$;
   exports.SetBase = SetBase;
   exports.SetBase$ = SetBase$;
   exports.SplayTreeMap = SplayTreeMap;
   exports.SplayTreeMap$ = SplayTreeMap$;
   exports.SplayTreeSet = SplayTreeSet;
   exports.SplayTreeSet$ = SplayTreeSet$;
 })(collection || (collection = {}));