more care around generated names, fixes #60 #82 and #97

lib/runtime/dart/collection.js

 var collection;
 (function(exports) {
   'use strict';
   let _source = Symbol('_source');
   let UnmodifiableListView$ = dart.generic(function(E) {
     class UnmodifiableListView extends _internal.UnmodifiableListBase$(E) {
       UnmodifiableListView(source) {
         this[_source] = source;
         super.UnmodifiableListBase();
       }
@@ skipping 10 matching lines @@
   // Function _defaultEquals: (dynamic, dynamic) → bool
   function _defaultEquals(a, b) {
     return dart.equals(a, b);
   }
   // Function _defaultHashCode: (dynamic) → int
   function _defaultHashCode(a) {
     return dart.as(dart.dload(a, 'hashCode'), core.int);
   }
   let HashMap$ = dart.generic(function(K, V) {
     class HashMap extends core.Object {
-      HashMap(opt$) {
-        let equals = opt$ && 'equals' in opt$ ? opt$.equals : null;
-        let hashCode = opt$ && 'hashCode' in opt$ ? opt$.hashCode : null;
-        let isValidKey = opt$ && 'isValidKey' in opt$ ? opt$.isValidKey : null;
+      HashMap(opts) {
+        let equals = opts && 'equals' in opts ? opts.equals : null;
+        let hashCode = opts && 'hashCode' in opts ? opts.hashCode : null;
+        let isValidKey = opts && 'isValidKey' in opts ? opts.isValidKey : null;
         if (isValidKey === null) {
           if (hashCode === null) {
             if (equals === null) {
               return new _HashMap();
             }
             hashCode = dart.closureWrap(_defaultHashCode, "(K) → int");
           } else {
             if (dart.notNull(core.identical(core.identityHashCode, hashCode)) && dart.notNull(core.identical(core.identical, equals))) {
               return new _IdentityHashMap();
             }
@@ skipping 14 matching lines @@
       HashMap$identity() {
         return new _IdentityHashMap();
       }
       HashMap$from(other) {
         let result = new HashMap();
         other.forEach((k, v) => {
           result.set(k, dart.as(v, V));
         });
         return result;
       }
-      HashMap$fromIterable(iterable, opt$) {
-        let key = opt$ && 'key' in opt$ ? opt$.key : null;
-        let value = opt$ && 'value' in opt$ ? opt$.value : null;
+      HashMap$fromIterable(iterable, opts) {
+        let key = opts && 'key' in opts ? opts.key : null;
+        let value = opts && 'value' in opts ? opts.value : null;
         let map = new HashMap();
         Maps._fillMapWithMappedIterable(map, iterable, key, value);
         return map;
       }
       HashMap$fromIterables(keys, values) {
         let map = new HashMap();
         Maps._fillMapWithIterables(map, keys, values);
         return map;
       }
     }
@@ skipping 69 matching lines @@
         return result;
       }
       difference(other) {
         let result = this.toSet();
         for (let element of this) {
           if (other.contains(element))
             result.remove(element);
         }
         return result;
       }
-      toList(opt$) {
-        let growable = opt$ && 'growable' in opt$ ? opt$.growable : true;
+      toList(opts) {
+        let growable = opts && 'growable' in opts ? opts.growable : true;
         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((($tmp) => i = dart.notNull($tmp) + 1, $tmp)(i), element);
+          result.set(((x) => i = dart.notNull(x$) + 1, x$)(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 88 matching lines @@
         let it = this.iterator;
         if (!dart.notNull(it.moveNext())) {
           throw _internal.IterableElementError.noElement();
         }
         let result = null;
         do {
           result = dart.as(it.current, E);
         } while (it.moveNext());
         return result;
       }
-      firstWhere(test, opt$) {
-        let orElse = opt$ && 'orElse' in opt$ ? opt$.orElse : null;
+      firstWhere(test, opts) {
+        let orElse = opts && 'orElse' in opts ? opts.orElse : null;
         for (let element of this) {
           if (test(element))
             return element;
         }
         if (orElse !== null)
           return orElse();
         throw _internal.IterableElementError.noElement();
       }
-      lastWhere(test, opt$) {
-        let orElse = opt$ && 'orElse' in opt$ ? opt$.orElse : null;
+      lastWhere(test, opts) {
+        let orElse = opts && 'orElse' in opts ? opts.orElse : null;
         let result = null;
         let foundMatching = false;
         for (let element of this) {
           if (test(element)) {
             result = element;
             foundMatching = true;
           }
         }
         if (foundMatching)
           return result;
@@ skipping 65 matching lines @@
           _.addAll(this);
           return _;
         }).bind(this)(this[_newSet]());
       }
     }
     return _HashSetBase;
   });
   let _HashSetBase = _HashSetBase$(dart.dynamic);
   let HashSet$ = dart.generic(function(E) {
     class HashSet extends core.Object {
-      HashSet(opt$) {
-        let equals = opt$ && 'equals' in opt$ ? opt$.equals : null;
-        let hashCode = opt$ && 'hashCode' in opt$ ? opt$.hashCode : null;
-        let isValidKey = opt$ && 'isValidKey' in opt$ ? opt$.isValidKey : null;
+      HashSet(opts) {
+        let equals = opts && 'equals' in opts ? opts.equals : null;
+        let hashCode = opts && 'hashCode' in opts ? opts.hashCode : null;
+        let isValidKey = opts && 'isValidKey' in opts ? opts.isValidKey : null;
         if (isValidKey === null) {
           if (hashCode === null) {
             if (equals === null) {
               return new _HashSet();
             }
             hashCode = dart.closureWrap(_defaultHashCode, "(E) → int");
           } else {
             if (dart.notNull(core.identical(core.identityHashCode, hashCode)) && dart.notNull(core.identical(core.identical, equals))) {
               return new _IdentityHashSet();
             }
@@ skipping 92 matching lines @@
         }
         return buffer.toString();
       }
       any(f) {
         for (let element of this) {
           if (f(element))
             return true;
         }
         return false;
       }
-      toList(opt$) {
-        let growable = opt$ && 'growable' in opt$ ? opt$.growable : true;
+      toList(opts) {
+        let growable = opts && 'growable' in opts ? opts.growable : true;
         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()) {
@@ skipping 39 matching lines @@
       }
       get single() {
         let it = this.iterator;
         if (!dart.notNull(it.moveNext()))
           throw _internal.IterableElementError.noElement();
         let result = dart.as(it.current, E);
         if (it.moveNext())
           throw _internal.IterableElementError.tooMany();
         return result;
       }
-      firstWhere(test, opt$) {
-        let orElse = opt$ && 'orElse' in opt$ ? opt$.orElse : null;
+      firstWhere(test, opts) {
+        let orElse = opts && 'orElse' in opts ? opts.orElse : null;
         for (let element of this) {
           if (test(element))
             return element;
         }
         if (orElse !== null)
           return orElse();
         throw _internal.IterableElementError.noElement();
       }
-      lastWhere(test, opt$) {
-        let orElse = opt$ && 'orElse' in opt$ ? opt$.orElse : null;
+      lastWhere(test, opts) {
+        let orElse = opts && 'orElse' in opts ? opts.orElse : null;
         let result = null;
         let foundMatching = false;
         for (let element of this) {
           if (test(element)) {
             result = element;
             foundMatching = true;
           }
         }
         if (foundMatching)
           return result;
@@ skipping 29 matching lines @@
         }
         throw new core.RangeError.index(index, this, "index", null, elementIndex);
       }
       toString() {
         return IterableBase.iterableToShortString(this, '(', ')');
       }
     }
     return IterableMixin;
   });
   let IterableMixin = IterableMixin$(dart.dynamic);
-  let _isToStringVisiting = Symbol('_isToStringVisiting');
-  let _iterablePartsToStrings = Symbol('_iterablePartsToStrings');
+  let _isToStringVisiting$ = Symbol('_isToStringVisiting');
+  let _iterablePartsToStrings$ = Symbol('_iterablePartsToStrings');
   let IterableBase$ = dart.generic(function(E) {
     class IterableBase extends core.Object {
       IterableBase() {
       }
       map(f) {
         return new _internal.MappedIterable(this, f);
       }
       where(f) {
         return new _internal.WhereIterable(this, f);
       }
@@ skipping 55 matching lines @@
         }
         return buffer.toString();
       }
       any(f) {
         for (let element of this) {
           if (f(element))
             return true;
         }
         return false;
       }
-      toList(opt$) {
-        let growable = opt$ && 'growable' in opt$ ? opt$.growable : true;
+      toList(opts) {
+        let growable = opts && 'growable' in opts ? opts.growable : true;
         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()) {
@@ skipping 39 matching lines @@
       }
       get single() {
         let it = this.iterator;
         if (!dart.notNull(it.moveNext()))
           throw _internal.IterableElementError.noElement();
         let result = dart.as(it.current, E);
         if (it.moveNext())
           throw _internal.IterableElementError.tooMany();
         return result;
       }
-      firstWhere(test, opt$) {
-        let orElse = opt$ && 'orElse' in opt$ ? opt$.orElse : null;
+      firstWhere(test, opts) {
+        let orElse = opts && 'orElse' in opts ? opts.orElse : null;
         for (let element of this) {
           if (test(element))
             return element;
         }
         if (orElse !== null)
           return orElse();
         throw _internal.IterableElementError.noElement();
       }
-      lastWhere(test, opt$) {
-        let orElse = opt$ && 'orElse' in opt$ ? opt$.orElse : null;
+      lastWhere(test, opts) {
+        let orElse = opts && 'orElse' in opts ? opts.orElse : null;
         let result = null;
         let foundMatching = false;
         for (let element of this) {
           if (test(element)) {
             result = element;
             foundMatching = true;
           }
         }
         if (foundMatching)
           return result;
@@ skipping 69 matching lines @@
         _toStringVisiting.add(iterable);
         try {
           buffer.writeAll(iterable, ", ");
         } finally {
           dart.assert(core.identical(_toStringVisiting.last, iterable));
           _toStringVisiting.removeLast();
         }
         buffer.write(rightDelimiter);
         return buffer.toString();
       }
-      static [_isToStringVisiting](o) {
+      static [_isToStringVisiting$](o) {
         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) {
+      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)) {
@@ skipping 71 matching lines @@
       }
     });
     return IterableBase;
   });
   let IterableBase = IterableBase$(dart.dynamic);
   let _iterator = Symbol('_iterator');
   let _state = Symbol('_state');
   let _move = Symbol('_move');
   let HasNextIterator$ = dart.generic(function(E) {
     class HasNextIterator extends core.Object {
-      HasNextIterator($_iterator) {
-        this[_iterator] = $_iterator;
+      HasNextIterator(iterator$) {
+        this[_iterator] = iterator$;
         this[_state] = HasNextIterator._NOT_MOVED_YET;
       }
       get hasNext() {
         if (this[_state] === HasNextIterator._NOT_MOVED_YET)
           this[_move]();
         return this[_state] === HasNextIterator._HAS_NEXT_AND_NEXT_IN_CURRENT;
       }
       next() {
         if (!dart.notNull(this.hasNext))
           throw new core.StateError("No more elements");
@@ skipping 11 matching lines @@
       }
     }
     HasNextIterator._HAS_NEXT_AND_NEXT_IN_CURRENT = 0;
     HasNextIterator._NO_NEXT = 1;
     HasNextIterator._NOT_MOVED_YET = 2;
     return HasNextIterator;
   });
   let HasNextIterator = HasNextIterator$(dart.dynamic);
   let LinkedHashMap$ = dart.generic(function(K, V) {
     class LinkedHashMap extends core.Object {
-      LinkedHashMap(opt$) {
-        let equals = opt$ && 'equals' in opt$ ? opt$.equals : null;
-        let hashCode = opt$ && 'hashCode' in opt$ ? opt$.hashCode : null;
-        let isValidKey = opt$ && 'isValidKey' in opt$ ? opt$.isValidKey : null;
+      LinkedHashMap(opts) {
+        let equals = opts && 'equals' in opts ? opts.equals : null;
+        let hashCode = opts && 'hashCode' in opts ? opts.hashCode : null;
+        let isValidKey = opts && 'isValidKey' in opts ? opts.isValidKey : null;
         if (isValidKey === null) {
           if (hashCode === null) {
             if (equals === null) {
               return new _LinkedHashMap();
             }
             hashCode = dart.closureWrap(_defaultHashCode, "(K) → int");
           } else {
             if (dart.notNull(core.identical(core.identityHashCode, hashCode)) && dart.notNull(core.identical(core.identical, equals))) {
               return new _LinkedIdentityHashMap();
             }
@@ skipping 14 matching lines @@
       LinkedHashMap$identity() {
         return new _LinkedIdentityHashMap();
       }
       LinkedHashMap$from(other) {
         let result = new LinkedHashMap();
         other.forEach((k, v) => {
           result.set(k, dart.as(v, V));
         });
         return result;
       }
-      LinkedHashMap$fromIterable(iterable, opt$) {
-        let key = opt$ && 'key' in opt$ ? opt$.key : null;
-        let value = opt$ && 'value' in opt$ ? opt$.value : null;
+      LinkedHashMap$fromIterable(iterable, opts) {
+        let key = opts && 'key' in opts ? opts.key : null;
+        let value = opts && 'value' in opts ? opts.value : null;
         let map = new LinkedHashMap();
         Maps._fillMapWithMappedIterable(map, iterable, key, value);
         return map;
       }
       LinkedHashMap$fromIterables(keys, values) {
         let map = new LinkedHashMap();
         Maps._fillMapWithIterables(map, keys, values);
         return map;
       }
       LinkedHashMap$_literal(keyValuePairs) {
         return dart.as(_js_helper.fillLiteralMap(keyValuePairs, new _LinkedHashMap()), LinkedHashMap$(K, V));
       }
       LinkedHashMap$_empty() {
         return new _LinkedHashMap();
       }
     }
     dart.defineNamedConstructor(LinkedHashMap, 'identity');
     dart.defineNamedConstructor(LinkedHashMap, 'from');
     dart.defineNamedConstructor(LinkedHashMap, 'fromIterable');
     dart.defineNamedConstructor(LinkedHashMap, 'fromIterables');
     dart.defineNamedConstructor(LinkedHashMap, '_literal');
     dart.defineNamedConstructor(LinkedHashMap, '_empty');
     return LinkedHashMap;
   });
   let LinkedHashMap = LinkedHashMap$(dart.dynamic, dart.dynamic);
   let LinkedHashSet$ = dart.generic(function(E) {
     class LinkedHashSet extends core.Object {
-      LinkedHashSet(opt$) {
-        let equals = opt$ && 'equals' in opt$ ? opt$.equals : null;
-        let hashCode = opt$ && 'hashCode' in opt$ ? opt$.hashCode : null;
-        let isValidKey = opt$ && 'isValidKey' in opt$ ? opt$.isValidKey : null;
+      LinkedHashSet(opts) {
+        let equals = opts && 'equals' in opts ? opts.equals : null;
+        let hashCode = opts && 'hashCode' in opts ? opts.hashCode : null;
+        let isValidKey = opts && 'isValidKey' in opts ? opts.isValidKey : null;
         if (isValidKey === null) {
           if (hashCode === null) {
             if (equals === null) {
               return new _LinkedHashSet();
             }
             hashCode = dart.closureWrap(_defaultHashCode, "(E) → int");
           } else {
             if (dart.notNull(core.identical(core.identityHashCode, hashCode)) && dart.notNull(core.identical(core.identical, equals))) {
               return new _LinkedIdentityHashSet();
             }
@@ skipping 197 matching lines @@
       insertAfter(entry) {
         this[_list]._insertAfter(this, entry);
       }
       insertBefore(entry) {
         this[_list]._insertAfter(this[_previous], entry);
       }
     }
     return LinkedListEntry;
   });
   let LinkedListEntry = LinkedListEntry$(dart.dynamic);
-  let _filter = Symbol('_filter');
+  let _filter$ = Symbol('_filter');
   let ListMixin$ = dart.generic(function(E) {
     class ListMixin extends core.Object {
       get iterator() {
         return new _internal.ListIterator(this);
       }
       elementAt(index) {
         return this.get(index);
       }
       forEach(action) {
         let length = this.length;
@@ skipping 53 matching lines @@
         let length = this.length;
         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' in opt$ ? opt$.orElse : null;
+      firstWhere(test, opts) {
+        let orElse = opts && 'orElse' in opts ? opts.orElse : null;
         let length = this.length;
         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' in opt$ ? opt$.orElse : null;
+      lastWhere(test, opts) {
+        let orElse = opts && 'orElse' in opts ? opts.orElse : null;
         let length = this.length;
         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)
@@ skipping 68 matching lines @@
       }
       skipWhile(test) {
         return new _internal.SkipWhileIterable(this, test);
       }
       take(count) {
         return new _internal.SubListIterable(this, 0, count);
       }
       takeWhile(test) {
         return new _internal.TakeWhileIterable(this, test);
       }
-      toList(opt$) {
-        let growable = opt$ && 'growable' in opt$ ? opt$.growable : true;
+      toList(opts) {
+        let growable = opts && 'growable' in opts ? opts.growable : true;
         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); 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); i = dart.notNull(i) + 1) {
           result.add(this.get(i));
         }
         return result;
       }
       add(element) {
-        this.set((($tmp) => this.length = dart.notNull($tmp) + 1, $tmp).bind(this)(this.length), element);
+        this.set(((x) => this.length = dart.notNull(x$) + 1, x$).bind(this)(this.length), element);
       }
       addAll(iterable) {
         for (let element of iterable) {
-          this.set((($tmp) => this.length = dart.notNull($tmp) + 1, $tmp).bind(this)(this.length), element);
+          this.set(((x) => this.length = dart.notNull(x$) + 1, x$).bind(this)(this.length), element);
         }
       }
       remove(element) {
         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, test, false);
       }
       retainWhere(test) {
         _filter(this, test, true);
       }
-      static [_filter](source, test, retainMatching) {
+      static [_filter$](source, test, retainMatching) {
         let retained = new List.from([]);
         let length = source.length;
         for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let element = source.get(i);
           if (dart.dinvokef(test, element) === retainMatching) {
             retained.add(element);
           }
           if (length !== source.length) {
             throw new core.ConcurrentModificationError(source);
           }
@@ skipping 190 matching lines @@
         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((($tmp) => index = dart.notNull($tmp) + 1, $tmp)(index), element);
+            this.set(((x) => index = dart.notNull(x$) + 1, x$)(index), element);
           }
         }
       }
       get reversed() {
         return new _internal.ReversedListIterable(this);
       }
       toString() {
         return IterableBase.iterableToFullString(this, '[', ']');
       }
     }
@@ skipping 85 matching lines @@
   let _UnmodifiableMapMixin = _UnmodifiableMapMixin$(dart.dynamic, dart.dynamic);
   let UnmodifiableMapBase$ = dart.generic(function(K, V) {
     class UnmodifiableMapBase extends dart.mixin(_UnmodifiableMapMixin$(K, V)) {
     }
     return UnmodifiableMapBase;
   });
   let UnmodifiableMapBase = UnmodifiableMapBase$(dart.dynamic, dart.dynamic);
   let _map = Symbol('_map');
   let _MapBaseValueIterable$ = dart.generic(function(V) {
     class _MapBaseValueIterable extends IterableBase$(V) {
-      _MapBaseValueIterable($_map) {
-        this[_map] = $_map;
+      _MapBaseValueIterable(map$) {
+        this[_map] = map$;
         super.IterableBase();
       }
       get length() {
         return this[_map].length;
       }
       get isEmpty() {
         return this[_map].isEmpty;
       }
       get isNotEmpty() {
         return this[_map].isNotEmpty;
@@ skipping 90 matching lines @@
     }
     return MapView;
   });
   let MapView = MapView$(dart.dynamic, dart.dynamic);
   let UnmodifiableMapView$ = dart.generic(function(K, V) {
     class UnmodifiableMapView extends dart.mixin(_UnmodifiableMapMixin$(K, V)) {
     }
     return UnmodifiableMapView;
   });
   let UnmodifiableMapView = UnmodifiableMapView$(dart.dynamic, dart.dynamic);
-  let _toStringVisiting = Symbol('_toStringVisiting');
-  let _id = Symbol('_id');
+  let _toStringVisiting$ = Symbol('_toStringVisiting');
+  let _id$ = Symbol('_id');
   let _fillMapWithMappedIterable = Symbol('_fillMapWithMappedIterable');
   let _fillMapWithIterables = Symbol('_fillMapWithIterables');
   class Maps extends core.Object {
     static containsValue(map, value) {
       for (let v of map.values) {
         if (dart.equals(value, v)) {
           return true;
         }
       }
       return false;
@@ skipping 35 matching lines @@
     }
     static isNotEmpty(map) {
       return map.keys.isNotEmpty;
     }
     static mapToString(m) {
       if (IterableBase._isToStringVisiting(m)) {
         return '{...}';
       }
       let result = new core.StringBuffer();
       try {
-        IterableBase[_toStringVisiting].add(m);
+        IterableBase[_toStringVisiting$].add(m);
         result.write('{');
         let first = true;
         m.forEach(((k, v) => {
           if (!dart.notNull(first)) {
             result.write(', ');
           }
           first = false;
           result.write(k);
           result.write(': ');
           result.write(v);
         }).bind(this));
         result.write('}');
       } finally {
-        dart.assert(core.identical(IterableBase[_toStringVisiting].last, m));
-        IterableBase[_toStringVisiting].removeLast();
+        dart.assert(core.identical(IterableBase[_toStringVisiting$].last, m));
+        IterableBase[_toStringVisiting$].removeLast();
       }
       return result.toString();
     }
-    static [_id](x) {
+    static [_id$](x) {
       return x;
     }
     static [_fillMapWithMappedIterable](map, iterable, key, value) {
       if (key === null)
         key = _id;
       if (value === null)
         value = _id;
       for (let element of iterable) {
         map.set(dart.dinvokef(key, element), dart.dinvokef(value, element));
       }
@@ skipping 149 matching lines @@
         while (!dart.notNull(core.identical(entry, this[_sentinel]))) {
           if (dart.equals(entry.element, o)) {
             entry.remove();
             this[_elementCount] = dart.notNull(this[_elementCount]) - 1;
             return true;
           }
           entry = entry[_next];
         }
         return false;
       }
-      [_filter](test, removeMatching) {
+      [_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();
             this[_elementCount] = dart.notNull(this[_elementCount]) - 1;
           }
           entry = next;
         }
       }
       removeWhere(test) {
-        this[_filter](test, true);
+        this[_filter$](test, true);
       }
       retainWhere(test) {
-        this[_filter](test, false);
+        this[_filter$](test, false);
       }
       get first() {
         return this[_sentinel][_next].element;
       }
       get last() {
         return this[_sentinel][_previous].element;
       }
       get single() {
         if (core.identical(this[_sentinel][_next], this[_sentinel][_previous])) {
           return this[_sentinel][_next].element;
@@ skipping 61 matching lines @@
   let _head = Symbol('_head');
   let _tail = Symbol('_tail');
   let _table = Symbol('_table');
   let _checkModification = Symbol('_checkModification');
   let _writeToList = Symbol('_writeToList');
   let _add = Symbol('_add');
   let _preGrow = Symbol('_preGrow');
   let _remove = Symbol('_remove');
   let _filterWhere = Symbol('_filterWhere');
   let _grow = Symbol('_grow');
-  let _isPowerOf2 = Symbol('_isPowerOf2');
-  let _nextPowerOf2 = Symbol('_nextPowerOf2');
+  let _isPowerOf2$ = Symbol('_isPowerOf2');
+  let _nextPowerOf2$ = Symbol('_nextPowerOf2');
   let ListQueue$ = dart.generic(function(E) {
     class ListQueue extends IterableBase$(E) {
       ListQueue(initialCapacity) {
         if (initialCapacity === void 0)
           initialCapacity = null;
         this[_head] = 0;
         this[_tail] = 0;
         this[_table] = null;
         this[_modificationCount] = 0;
         super.IterableBase();
@@ skipping 56 matching lines @@
         if (this[_head] === this[_tail])
           throw _internal.IterableElementError.noElement();
         if (dart.notNull(this.length) > 1)
           throw _internal.IterableElementError.tooMany();
         return this[_table].get(this[_head]);
       }
       elementAt(index) {
         core.RangeError.checkValidIndex(index, this);
         return this[_table].get(dart.notNull(this[_head]) + dart.notNull(index) & dart.notNull(this[_table].length) - 1);
       }
-      toList(opt$) {
-        let growable = opt$ && 'growable' in opt$ ? opt$.growable : true;
+      toList(opts) {
+        let growable = opts && 'growable' in opts ? opts.growable : true;
         let list = null;
         if (growable) {
           list = ((_) => {
             _.length = this.length;
             return _;
           }).bind(this)(new core.List());
         } else {
           list = new core.List(this.length);
         }
         this[_writeToList](list);
@@ skipping 95 matching lines @@
       }
       removeLast() {
         if (this[_head] === this[_tail])
           throw _internal.IterableElementError.noElement();
         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) {
+      static [_isPowerOf2$](number) {
         return (dart.notNull(number) & dart.notNull(number) - 1) === 0;
       }
-      static [_nextPowerOf2](number) {
+      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) {
@@ skipping 298 matching lines @@
         if (compare === void 0)
           compare = null;
         if (isValidKey === void 0)
           isValidKey = null;
         let result = new SplayTreeMap();
         other.forEach((k, v) => {
           result.set(k, dart.as(v, V));
         });
         return result;
       }
-      SplayTreeMap$fromIterable(iterable, opt$) {
-        let key = opt$ && 'key' in opt$ ? opt$.key : null;
-        let value = opt$ && 'value' in opt$ ? opt$.value : null;
-        let compare = opt$ && 'compare' in opt$ ? opt$.compare : null;
-        let isValidKey = opt$ && 'isValidKey' in opt$ ? opt$.isValidKey : null;
+      SplayTreeMap$fromIterable(iterable, opts) {
+        let key = opts && 'key' in opts ? opts.key : null;
+        let value = opts && 'value' in opts ? opts.value : null;
+        let compare = opts && 'compare' in opts ? opts.compare : null;
+        let isValidKey = opts && 'isValidKey' in opts ? opts.isValidKey : null;
         let map = new SplayTreeMap(compare, isValidKey);
         Maps._fillMapWithMappedIterable(map, iterable, key, value);
         return map;
       }
       SplayTreeMap$fromIterables(keys, values, compare, isValidKey) {
         if (compare === void 0)
           compare = null;
         if (isValidKey === void 0)
           isValidKey = null;
         let map = new SplayTreeMap(compare, isValidKey);
@@ skipping 236 matching lines @@
         this[_findLeftMostDescendent](this[_currentNode].right);
         return true;
       }
     }
     dart.defineNamedConstructor(_SplayTreeIterator, 'startAt');
     return _SplayTreeIterator;
   });
   let _SplayTreeIterator = _SplayTreeIterator$(dart.dynamic);
   let _SplayTreeKeyIterable$ = dart.generic(function(K) {
     class _SplayTreeKeyIterable extends IterableBase$(K) {
-      _SplayTreeKeyIterable($_tree) {
-        this[_tree] = $_tree;
+      _SplayTreeKeyIterable(tree$) {
+        this[_tree] = tree$;
         super.IterableBase();
       }
       get length() {
         return this[_tree][_count];
       }
       get isEmpty() {
         return this[_tree][_count] === 0;
       }
       get iterator() {
         return new _SplayTreeKeyIterator(this[_tree]);
       }
       toSet() {
         let setOrMap = this[_tree];
         let set = new SplayTreeSet(dart.as(setOrMap[_comparator], dart.throw_("Unimplemented type (K, K) → int")), dart.as(setOrMap[_validKey], dart.throw_("Unimplemented type (dynamic) → bool")));
         set[_count] = this[_tree][_count];
         set[_root] = set._copyNode(this[_tree][_root]);
         return set;
       }
     }
     return _SplayTreeKeyIterable;
   });
   let _SplayTreeKeyIterable = _SplayTreeKeyIterable$(dart.dynamic);
   let _SplayTreeValueIterable$ = dart.generic(function(K, V) {
     class _SplayTreeValueIterable extends IterableBase$(V) {
-      _SplayTreeValueIterable($_map) {
-        this[_map] = $_map;
+      _SplayTreeValueIterable(map$) {
+        this[_map] = map$;
         super.IterableBase();
       }
       get length() {
         return this[_map][_count];
       }
       get isEmpty() {
         return this[_map][_count] === 0;
       }
       get iterator() {
         return new _SplayTreeValueIterator(this[_map]);
@@ skipping 207 matching lines @@
   let _rest = Symbol('_rest');
   let _containsKey = Symbol('_containsKey');
   let _getBucket = Symbol('_getBucket');
   let _findBucketIndex = Symbol('_findBucketIndex');
   let _computeKeys = Symbol('_computeKeys');
   let _get = Symbol('_get');
   let _addHashTableEntry = Symbol('_addHashTableEntry');
   let _set = Symbol('_set');
   let _computeHashCode = Symbol('_computeHashCode');
   let _removeHashTableEntry = Symbol('_removeHashTableEntry');
-  let _isStringKey = Symbol('_isStringKey');
-  let _isNumericKey = Symbol('_isNumericKey');
-  let _hasTableEntry = Symbol('_hasTableEntry');
-  let _getTableEntry = Symbol('_getTableEntry');
-  let _setTableEntry = Symbol('_setTableEntry');
-  let _deleteTableEntry = Symbol('_deleteTableEntry');
-  let _newHashTable = Symbol('_newHashTable');
+  let _isStringKey$ = Symbol('_isStringKey');
+  let _isNumericKey$ = Symbol('_isNumericKey');
+  let _hasTableEntry$ = Symbol('_hasTableEntry');
+  let _getTableEntry$ = Symbol('_getTableEntry');
+  let _setTableEntry$ = Symbol('_setTableEntry');
+  let _deleteTableEntry$ = Symbol('_deleteTableEntry');
+  let _newHashTable$ = Symbol('_newHashTable');
   let _HashMap$ = dart.generic(function(K, V) {
     class _HashMap extends core.Object {
       _HashMap() {
         this[_length] = 0;
         this[_strings] = null;
         this[_nums] = null;
         this[_rest] = null;
         this[_keys] = null;
       }
       get length() {
@@ skipping 190 matching lines @@
         if (dart.notNull(table !== null) && dart.notNull(_hasTableEntry(table, key))) {
           let value = dart.as(_getTableEntry(table, key), V);
           _deleteTableEntry(table, key);
           this[_length] = dart.notNull(this[_length]) - 1;
           this[_keys] = null;
           return value;
         } else {
           return null;
         }
       }
-      static [_isStringKey](key) {
+      static [_isStringKey$](key) {
         return dart.notNull(typeof key == string) && dart.notNull(!dart.equals(key, '__proto__'));
       }
-      static [_isNumericKey](key) {
+      static [_isNumericKey$](key) {
         return dart.notNull(dart.is(key, core.num)) && (key & 0x3ffffff) === key;
       }
       [_computeHashCode](key) {
         return dart.dload(key, 'hashCode') & 0x3ffffff;
       }
-      static [_hasTableEntry](table, key) {
+      static [_hasTableEntry$](table, key) {
         let entry = table[key];
         return entry !== null;
       }
-      static [_getTableEntry](table, key) {
+      static [_getTableEntry$](table, key) {
         let entry = table[key];
         return entry === table ? null : entry;
       }
-      static [_setTableEntry](table, key, value) {
+      static [_setTableEntry$](table, key, value) {
         if (value === null) {
           table[key] = table;
         } else {
           table[key] = value;
         }
       }
-      static [_deleteTableEntry](table, key) {
+      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); i = 2) {
           if (dart.equals(bucket[i], key))
             return i;
         }
         return -1;
       }
-      static [_newHashTable]() {
+      static [_newHashTable$]() {
         let table = Object.create(null);
         let temporaryKey = '<non-identifier-key>';
         _setTableEntry(table, temporaryKey, table);
         _deleteTableEntry(table, temporaryKey);
         return table;
       }
     }
     return _HashMap;
   });
   let _HashMap = _HashMap$(dart.dynamic, dart.dynamic);
@@ skipping 13 matching lines @@
         return -1;
       }
     }
     return _IdentityHashMap;
   });
   let _IdentityHashMap = _IdentityHashMap$(dart.dynamic, dart.dynamic);
   let _equals = Symbol('_equals');
   let _hashCode = Symbol('_hashCode');
   let _CustomHashMap$ = dart.generic(function(K, V) {
     class _CustomHashMap extends _HashMap$(K, V) {
-      _CustomHashMap($_equals, $_hashCode, validKey) {
-        this[_equals] = $_equals;
-        this[_hashCode] = $_hashCode;
+      _CustomHashMap(equals$, hashCode$, validKey) {
+        this[_equals] = equals$;
+        this[_hashCode] = hashCode$;
         this[_validKey] = dart.as(validKey !== null ? validKey : (v) => dart.is(v, K), _Predicate);
         super._HashMap();
       }
       get(key) {
         if (!dart.notNull(dart.dinvokef(this[_validKey], key)))
           return null;
         return super._get(key);
       }
       set(key, value) {
         super._set(key, value);
@@ skipping 23 matching lines @@
       }
       toString() {
         return Maps.mapToString(this);
       }
     }
     return _CustomHashMap;
   });
   let _CustomHashMap = _CustomHashMap$(dart.dynamic, dart.dynamic);
   let HashMapKeyIterable$ = dart.generic(function(E) {
     class HashMapKeyIterable extends IterableBase$(E) {
-      HashMapKeyIterable($_map) {
-        this[_map] = $_map;
+      HashMapKeyIterable(map$) {
+        this[_map] = map$;
         super.IterableBase();
       }
       get length() {
         return dart.as(dart.dload(this[_map], '_length'), core.int);
       }
       get isEmpty() {
         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));
@@ skipping 10 matching lines @@
           }
         }
       }
     }
     return HashMapKeyIterable;
   });
   let HashMapKeyIterable = HashMapKeyIterable$(dart.dynamic);
   let _offset = Symbol('_offset');
   let HashMapKeyIterator$ = dart.generic(function(E) {
     class HashMapKeyIterator extends core.Object {
-      HashMapKeyIterator($_map, $_keys) {
-        this[_map] = $_map;
-        this[_keys] = $_keys;
+      HashMapKeyIterator(map$, keys$) {
+        this[_map] = map$;
+        this[_keys] = keys$;
         this[_offset] = 0;
         this[_current] = null;
       }
       get current() {
         return this[_current];
       }
       moveNext() {
         let keys = this[_keys];
         let offset = this[_offset];
         if (keys !== dart.dload(this[_map], '_keys')) {
@@ skipping 229 matching lines @@
         }
         if (next === null) {
           dart.assert(dart.equals(cell, this[_last]));
           this[_last] = previous;
         } else {
           next[_previous] = previous;
         }
         this[_length] = dart.notNull(this[_length]) - 1;
         this[_modified]();
       }
-      static [_isStringKey](key) {
+      static [_isStringKey$](key) {
         return dart.notNull(typeof key == string) && dart.notNull(!dart.equals(key, '__proto__'));
       }
-      static [_isNumericKey](key) {
+      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) {
+      static [_getTableEntry$](table, key) {
         return table[key];
       }
-      static [_setTableEntry](table, key, value) {
+      static [_setTableEntry$](table, key, value) {
         dart.assert(value !== null);
         table[key] = value;
       }
-      static [_deleteTableEntry](table, key) {
+      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); i = dart.notNull(i) + 1) {
           let cell = dart.as(bucket[i], LinkedHashMapCell);
           if (dart.equals(cell[_key], key))
             return i;
         }
         return -1;
       }
-      static [_newHashTable]() {
+      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);
       }
     }
@@ skipping 15 matching lines @@
             return i;
         }
         return -1;
       }
     }
     return _LinkedIdentityHashMap;
   });
   let _LinkedIdentityHashMap = _LinkedIdentityHashMap$(dart.dynamic, dart.dynamic);
   let _LinkedCustomHashMap$ = dart.generic(function(K, V) {
     class _LinkedCustomHashMap extends _LinkedHashMap$(K, V) {
-      _LinkedCustomHashMap($_equals, $_hashCode, validKey) {
-        this[_equals] = $_equals;
-        this[_hashCode] = $_hashCode;
+      _LinkedCustomHashMap(equals$, hashCode$, validKey) {
+        this[_equals] = equals$;
+        this[_hashCode] = hashCode$;
         this[_validKey] = dart.as(validKey !== null ? validKey : (v) => dart.is(v, K), _Predicate);
         super._LinkedHashMap();
       }
       get(key) {
         if (!dart.notNull(dart.dinvokef(this[_validKey], key)))
           return null;
         return super._get(key);
       }
       set(key, value) {
         super._set(key, value);
@@ skipping 20 matching lines @@
           if (this[_equals](dart.as(cell[_key], K), dart.as(key, K)))
             return i;
         }
         return -1;
       }
     }
     return _LinkedCustomHashMap;
   });
   let _LinkedCustomHashMap = _LinkedCustomHashMap$(dart.dynamic, dart.dynamic);
   class LinkedHashMapCell extends core.Object {
-    LinkedHashMapCell($_key, $_value) {
-      this[_key] = $_key;
-      this[_value] = $_value;
+    LinkedHashMapCell(key$, value$) {
+      this[_key] = key$;
+      this[_value] = value$;
       this[_next] = null;
       this[_previous] = null;
     }
   }
   let LinkedHashMapKeyIterable$ = dart.generic(function(E) {
     class LinkedHashMapKeyIterable extends IterableBase$(E) {
-      LinkedHashMapKeyIterable($_map) {
-        this[_map] = $_map;
+      LinkedHashMapKeyIterable(map$) {
+        this[_map] = map$;
         super.IterableBase();
       }
       get length() {
         return dart.as(dart.dload(this[_map], '_length'), core.int);
       }
       get isEmpty() {
         return dart.equals(dart.dload(this[_map], '_length'), 0);
       }
       get iterator() {
         return new LinkedHashMapKeyIterator(this[_map], dart.as(dart.dload(this[_map], '_modifications'), core.int));
@@ skipping 12 matching lines @@
           cell = cell[_next];
         }
       }
     }
     return LinkedHashMapKeyIterable;
   });
   let LinkedHashMapKeyIterable = LinkedHashMapKeyIterable$(dart.dynamic);
   let _cell = Symbol('_cell');
   let LinkedHashMapKeyIterator$ = dart.generic(function(E) {
     class LinkedHashMapKeyIterator extends core.Object {
-      LinkedHashMapKeyIterator($_map, $_modifications) {
-        this[_map] = $_map;
-        this[_modifications] = $_modifications;
+      LinkedHashMapKeyIterator(map$, modifications$) {
+        this[_map] = map$;
+        this[_modifications] = modifications$;
         this[_cell] = null;
         this[_current] = null;
         this[_cell] = dart.as(dart.dload(this[_map], '_first'), LinkedHashMapCell);
       }
       get current() {
         return this[_current];
       }
       moveNext() {
         if (this[_modifications] !== dart.dload(this[_map], '_modifications')) {
           throw new core.ConcurrentModificationError(this[_map]);
         } else if (this[_cell] === null) {
           this[_current] = null;
           return false;
         } else {
           this[_current] = dart.as(this[_cell][_key], E);
           this[_cell] = this[_cell][_next];
           return true;
         }
       }
     }
     return LinkedHashMapKeyIterator;
   });
   let LinkedHashMapKeyIterator = LinkedHashMapKeyIterator$(dart.dynamic);
   let _elements = Symbol('_elements');
   let _computeElements = Symbol('_computeElements');
   let _contains = Symbol('_contains');
   let _lookup = Symbol('_lookup');
-  let _isStringElement = Symbol('_isStringElement');
-  let _isNumericElement = Symbol('_isNumericElement');
+  let _isStringElement$ = Symbol('_isStringElement');
+  let _isNumericElement$ = Symbol('_isNumericElement');
   let _HashSet$ = dart.generic(function(E) {
     class _HashSet extends _HashSetBase$(E) {
       _HashSet() {
         this[_length] = 0;
         this[_strings] = null;
         this[_nums] = null;
         this[_rest] = null;
         this[_elements] = null;
         super._HashSetBase();
       }
@@ skipping 165 matching lines @@
       [_removeHashTableEntry](table, element) {
         if (dart.notNull(table !== null) && dart.notNull(_hasTableEntry(table, element))) {
           _deleteTableEntry(table, element);
           this[_length] = dart.notNull(this[_length]) - 1;
           this[_elements] = null;
           return true;
         } else {
           return false;
         }
       }
-      static [_isStringElement](element) {
+      static [_isStringElement$](element) {
         return dart.notNull(typeof element == string) && dart.notNull(!dart.equals(element, '__proto__'));
       }
-      static [_isNumericElement](element) {
+      static [_isNumericElement$](element) {
         return dart.notNull(dart.is(element, core.num)) && (element & 0x3ffffff) === element;
       }
       [_computeHashCode](element) {
         return dart.dload(element, 'hashCode') & 0x3ffffff;
       }
-      static [_hasTableEntry](table, key) {
+      static [_hasTableEntry$](table, key) {
         let entry = table[key];
         return entry !== null;
       }
-      static [_setTableEntry](table, key, value) {
+      static [_setTableEntry$](table, key, value) {
         dart.assert(value !== null);
         table[key] = value;
       }
-      static [_deleteTableEntry](table, key) {
+      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); i = dart.notNull(i) + 1) {
           if (dart.equals(bucket[i], element))
             return i;
         }
         return -1;
       }
-      static [_newHashTable]() {
+      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$(dart.dynamic);
@@ skipping 16 matching lines @@
         return -1;
       }
     }
     return _IdentityHashSet;
   });
   let _IdentityHashSet = _IdentityHashSet$(dart.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;
+      _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;
@@ skipping 23 matching lines @@
         if (!dart.notNull(dart.dinvokef(this[_validKey], object)))
           return false;
         return super._remove(object);
       }
     }
     return _CustomHashSet;
   });
   let _CustomHashSet = _CustomHashSet$(dart.dynamic);
   let HashSetIterator$ = dart.generic(function(E) {
     class HashSetIterator extends core.Object {
-      HashSetIterator($_set, $_elements) {
-        this[_set] = $_set;
-        this[_elements] = $_elements;
+      HashSetIterator(set$, elements$) {
+        this[_set] = set$;
+        this[_elements] = elements$;
         this[_offset] = 0;
         this[_current] = null;
       }
       get current() {
         return this[_current];
       }
       moveNext() {
         let elements = this[_elements];
         let offset = this[_offset];
         if (elements !== dart.dload(this[_set], '_elements')) {
@@ skipping 230 matching lines @@
         }
         if (next === null) {
           dart.assert(dart.equals(cell, this[_last]));
           this[_last] = previous;
         } else {
           next[_previous] = previous;
         }
         this[_length] = dart.notNull(this[_length]) - 1;
         this[_modified]();
       }
-      static [_isStringElement](element) {
+      static [_isStringElement$](element) {
         return dart.notNull(typeof element == string) && dart.notNull(!dart.equals(element, '__proto__'));
       }
-      static [_isNumericElement](element) {
+      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) {
+      static [_getTableEntry$](table, key) {
         return table[key];
       }
-      static [_setTableEntry](table, key, value) {
+      static [_setTableEntry$](table, key, value) {
         dart.assert(value !== null);
         table[key] = value;
       }
-      static [_deleteTableEntry](table, key) {
+      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); i = dart.notNull(i) + 1) {
           let cell = dart.as(bucket[i], LinkedHashSetCell);
           if (dart.equals(cell[_element], element))
             return i;
         }
         return -1;
       }
-      static [_newHashTable]() {
+      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$(dart.dynamic);
@@ skipping 15 matching lines @@
             return i;
         }
         return -1;
       }
     }
     return _LinkedIdentityHashSet;
   });
   let _LinkedIdentityHashSet = _LinkedIdentityHashSet$(dart.dynamic);
   let _LinkedCustomHashSet$ = dart.generic(function(E) {
     class _LinkedCustomHashSet extends _LinkedHashSet$(E) {
-      _LinkedCustomHashSet($_equality, $_hasher, validKey) {
-        this[_equality] = $_equality;
-        this[_hasher] = $_hasher;
+      _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;
@@ skipping 37 matching lines @@
           if (dart.dinvokef(this[_validKey], element)) {
             super._remove(element);
           }
         }
       }
     }
     return _LinkedCustomHashSet;
   });
   let _LinkedCustomHashSet = _LinkedCustomHashSet$(dart.dynamic);
   class LinkedHashSetCell extends core.Object {
-    LinkedHashSetCell($_element) {
-      this[_element] = $_element;
+    LinkedHashSetCell(element$) {
+      this[_element] = element$;
       this[_next] = null;
       this[_previous] = null;
     }
   }
   let LinkedHashSetIterator$ = dart.generic(function(E) {
     class LinkedHashSetIterator extends core.Object {
-      LinkedHashSetIterator($_set, $_modifications) {
-        this[_set] = $_set;
-        this[_modifications] = $_modifications;
+      LinkedHashSetIterator(set$, modifications$) {
+        this[_set] = set$;
+        this[_modifications] = modifications$;
         this[_cell] = null;
         this[_current] = null;
         this[_cell] = dart.as(dart.dload(this[_set], '_first'), LinkedHashSetCell);
       }
       get current() {
         return this[_current];
       }
       moveNext() {
         if (this[_modifications] !== dart.dload(this[_set], '_modifications')) {
           throw new core.ConcurrentModificationError(this[_set]);
@@ skipping 68 matching lines @@
   exports.LinkedHashMapKeyIterable = LinkedHashMapKeyIterable;
   exports.LinkedHashMapKeyIterable$ = LinkedHashMapKeyIterable$;
   exports.LinkedHashMapKeyIterator = LinkedHashMapKeyIterator;
   exports.LinkedHashMapKeyIterator$ = LinkedHashMapKeyIterator$;
   exports.HashSetIterator = HashSetIterator;
   exports.HashSetIterator$ = HashSetIterator$;
   exports.LinkedHashSetCell = LinkedHashSetCell;
   exports.LinkedHashSetIterator = LinkedHashSetIterator;
   exports.LinkedHashSetIterator$ = LinkedHashSetIterator$;
 })(collection || (collection = {}));