fix static members in _emitMemberName

lib/runtime/dart/core.js

 var core;
 (function(exports) {
   'use strict';
   class Object {
     constructor() {
       let name = this.constructor.name;
       let init = this[name];
       let result = void 0;
       if (init)
         result = init.apply(this, arguments);
@@ skipping 53 matching lines @@
   class bool extends Object {
     fromEnvironment(name, opts) {
       let defaultValue = opts && 'defaultValue' in opts ? opts.defaultValue : false;
       throw new UnsupportedError('bool.fromEnvironment can only be used as a const constructor');
     }
     toString() {
       return this ? "true" : "false";
     }
   }
   dart.defineNamedConstructor(bool, 'fromEnvironment');
-  let _toMangledNames = dart.JsSymbol('_toMangledNames');
   class Function extends Object {
     static apply(f, positionalArguments, namedArguments) {
       if (namedArguments === void 0)
         namedArguments = null;
-      return _js_helper.Primitives.applyFunction(f, positionalArguments, namedArguments == null ? null : Function[_toMangledNames](namedArguments));
+      return _js_helper.Primitives.applyFunction(f, positionalArguments, namedArguments == null ? null : Function._toMangledNames(namedArguments));
     }
-    static [_toMangledNames](namedArguments) {
+    static _toMangledNames(namedArguments) {
       let result = dart.map();
       namedArguments.forEach((symbol, value) => {
         result.set(_symbolToString(dart.as(symbol, Symbol)), value);
       });
       return result;
     }
   }
   let Comparator$ = dart.generic(function(T) {
     let Comparator = dart.typedef('Comparator', () => dart.functionType(int, [T, T]));
     return Comparator;
   });
   let Comparator = Comparator$();
   let Comparable$ = dart.generic(function(T) {
     class Comparable extends Object {
       static compare(a, b) {
         return a.compareTo(b);
       }
     }
     return Comparable;
   });
   let Comparable = Comparable$();
-  let _internal$ = dart.JsSymbol('_internal');
-  let _now = dart.JsSymbol('_now');
-  let _brokenDownDateToMillisecondsSinceEpoch = dart.JsSymbol('_brokenDownDateToMillisecondsSinceEpoch');
-  let _MAX_MILLISECONDS_SINCE_EPOCH = dart.JsSymbol('_MAX_MILLISECONDS_SINCE_EPOCH');
-  let _fourDigits = dart.JsSymbol('_fourDigits');
-  let _sixDigits = dart.JsSymbol('_sixDigits');
-  let _threeDigits = dart.JsSymbol('_threeDigits');
-  let _twoDigits = dart.JsSymbol('_twoDigits');
   class DateTime extends Object {
     DateTime(year, month, day, hour, minute, second, millisecond) {
       if (month === void 0)
         month = 1;
       if (day === void 0)
         day = 1;
       if (hour === void 0)
         hour = 0;
       if (minute === void 0)
         minute = 0;
       if (second === void 0)
         second = 0;
       if (millisecond === void 0)
         millisecond = 0;
-      this[_internal$](year, month, day, hour, minute, second, millisecond, false);
+      this._internal(year, month, day, hour, minute, second, millisecond, false);
     }
     utc(year, month, day, hour, minute, second, millisecond) {
       if (month === void 0)
         month = 1;
       if (day === void 0)
         day = 1;
       if (hour === void 0)
         hour = 0;
       if (minute === void 0)
         minute = 0;
       if (second === void 0)
         second = 0;
       if (millisecond === void 0)
         millisecond = 0;
-      this[_internal$](year, month, day, hour, minute, second, millisecond, true);
+      this._internal(year, month, day, hour, minute, second, millisecond, true);
     }
     now() {
-      this[_now]();
+      this._now();
     }
     static parse(formattedString) {
       let re = new RegExp('^([+-]?\\d{4,6})-?(\\d\\d)-?(\\d\\d)' + '(?:[ T](\\d\\d)(?::?(\\d\\d)(?::?(\\d\\d)(.\\d{1,6})?)?)?' + '( ?[zZ]| ?([-+])(\\d\\d)(?::?(\\d\\d))?)?)?$');
       let match = re.firstMatch(formattedString);
       if (match != null) {
         // Function parseIntOrZero: (String) → int
         function parseIntOrZero(matched) {
           if (matched == null)
             return 0;
           return int.parse(matched);
@@ skipping 20 matching lines @@
         if (match.get(8) != null) {
           isUtc = true;
           if (match.get(9) != null) {
             let sign = match.get(9) == '-' ? -1 : 1;
             let hourDifference = int.parse(match.get(10));
             let minuteDifference = parseIntOrZero(match.get(11));
             minuteDifference = dart.notNull(minuteDifference) + 60 * dart.notNull(hourDifference);
             minute = dart.notNull(minute) - dart.notNull(sign) * dart.notNull(minuteDifference);
           }
         }
-        let millisecondsSinceEpoch = DateTime[_brokenDownDateToMillisecondsSinceEpoch](years, month, day, hour, minute, second, millisecond, isUtc);
+        let millisecondsSinceEpoch = DateTime._brokenDownDateToMillisecondsSinceEpoch(years, month, day, hour, minute, second, millisecond, isUtc);
         if (millisecondsSinceEpoch == null) {
           throw new FormatException("Time out of range", formattedString);
         }
         if (addOneMillisecond) {
           millisecondsSinceEpoch = dart.notNull(millisecondsSinceEpoch) + 1;
         }
         return new DateTime.fromMillisecondsSinceEpoch(millisecondsSinceEpoch, {isUtc: isUtc});
       } else {
         throw new FormatException("Invalid date format", formattedString);
       }
     }
     fromMillisecondsSinceEpoch(millisecondsSinceEpoch, opts) {
       let isUtc = opts && 'isUtc' in opts ? opts.isUtc : false;
       this.millisecondsSinceEpoch = millisecondsSinceEpoch;
       this.isUtc = isUtc;
-      if (dart.notNull(millisecondsSinceEpoch.abs()) > dart.notNull(DateTime[_MAX_MILLISECONDS_SINCE_EPOCH])) {
+      if (dart.notNull(millisecondsSinceEpoch.abs()) > dart.notNull(DateTime._MAX_MILLISECONDS_SINCE_EPOCH)) {
         throw new ArgumentError(millisecondsSinceEpoch);
       }
       if (isUtc == null)
         throw new ArgumentError(isUtc);
     }
     ['=='](other) {
       if (!dart.is(other, DateTime))
         return false;
       return dart.equals(this.millisecondsSinceEpoch, dart.dload(other, 'millisecondsSinceEpoch')) && dart.equals(this.isUtc, dart.dload(other, 'isUtc'));
     }
@@ skipping 16 matching lines @@
       if (this.isUtc) {
         return new DateTime.fromMillisecondsSinceEpoch(this.millisecondsSinceEpoch, {isUtc: false});
       }
       return this;
     }
     toUtc() {
       if (this.isUtc)
         return this;
       return new DateTime.fromMillisecondsSinceEpoch(this.millisecondsSinceEpoch, {isUtc: true});
     }
-    static [_fourDigits](n) {
+    static _fourDigits(n) {
       let absN = n.abs();
       let sign = dart.notNull(n) < 0 ? "-" : "";
       if (dart.notNull(absN) >= 1000)
         return `${n}`;
       if (dart.notNull(absN) >= 100)
         return `${sign}0${absN}`;
       if (dart.notNull(absN) >= 10)
         return `${sign}00${absN}`;
       return `${sign}000${absN}`;
     }
-    static [_sixDigits](n) {
+    static _sixDigits(n) {
       dart.assert(dart.notNull(n) < -9999 || dart.notNull(n) > 9999);
       let absN = n.abs();
       let sign = dart.notNull(n) < 0 ? "-" : "+";
       if (dart.notNull(absN) >= 100000)
         return `${sign}${absN}`;
       return `${sign}0${absN}`;
     }
-    static [_threeDigits](n) {
+    static _threeDigits(n) {
       if (dart.notNull(n) >= 100)
         return `${n}`;
       if (dart.notNull(n) >= 10)
         return `0${n}`;
       return `00${n}`;
     }
-    static [_twoDigits](n) {
+    static _twoDigits(n) {
       if (dart.notNull(n) >= 10)
         return `${n}`;
       return `0${n}`;
     }
     toString() {
-      let y = DateTime[_fourDigits](this.year);
-      let m = DateTime[_twoDigits](this.month);
-      let d = DateTime[_twoDigits](this.day);
-      let h = DateTime[_twoDigits](this.hour);
-      let min = DateTime[_twoDigits](this.minute);
-      let sec = DateTime[_twoDigits](this.second);
-      let ms = DateTime[_threeDigits](this.millisecond);
+      let y = DateTime._fourDigits(this.year);
+      let m = DateTime._twoDigits(this.month);
+      let d = DateTime._twoDigits(this.day);
+      let h = DateTime._twoDigits(this.hour);
+      let min = DateTime._twoDigits(this.minute);
+      let sec = DateTime._twoDigits(this.second);
+      let ms = DateTime._threeDigits(this.millisecond);
       if (this.isUtc) {
         return `${y}-${m}-${d} ${h}:${min}:${sec}.${ms}Z`;
       } else {
         return `${y}-${m}-${d} ${h}:${min}:${sec}.${ms}`;
       }
     }
     toIso8601String() {
-      let y = dart.notNull(this.year) >= -9999 && dart.notNull(this.year) <= 9999 ? DateTime[_fourDigits](this.year) : DateTime[_sixDigits](this.year);
-      let m = DateTime[_twoDigits](this.month);
-      let d = DateTime[_twoDigits](this.day);
-      let h = DateTime[_twoDigits](this.hour);
-      let min = DateTime[_twoDigits](this.minute);
-      let sec = DateTime[_twoDigits](this.second);
-      let ms = DateTime[_threeDigits](this.millisecond);
+      let y = dart.notNull(this.year) >= -9999 && dart.notNull(this.year) <= 9999 ? DateTime._fourDigits(this.year) : DateTime._sixDigits(this.year);
+      let m = DateTime._twoDigits(this.month);
+      let d = DateTime._twoDigits(this.day);
+      let h = DateTime._twoDigits(this.hour);
+      let min = DateTime._twoDigits(this.minute);
+      let sec = DateTime._twoDigits(this.second);
+      let ms = DateTime._threeDigits(this.millisecond);
       if (this.isUtc) {
         return `${y}-${m}-${d}T${h}:${min}:${sec}.${ms}Z`;
       } else {
         return `${y}-${m}-${d}T${h}:${min}:${sec}.${ms}`;
       }
     }
     add(duration) {
       let ms = this.millisecondsSinceEpoch;
       return new DateTime.fromMillisecondsSinceEpoch(dart.notNull(ms) + dart.notNull(duration.inMilliseconds), {isUtc: this.isUtc});
     }
     subtract(duration) {
       let ms = this.millisecondsSinceEpoch;
       return new DateTime.fromMillisecondsSinceEpoch(dart.notNull(ms) - dart.notNull(duration.inMilliseconds), {isUtc: this.isUtc});
     }
     difference(other) {
       let ms = this.millisecondsSinceEpoch;
       let otherMs = other.millisecondsSinceEpoch;
       return new Duration({milliseconds: dart.notNull(ms) - dart.notNull(otherMs)});
     }
-    [_internal$](year, month, day, hour, minute, second, millisecond, isUtc) {
+    _internal(year, month, day, hour, minute, second, millisecond, isUtc) {
       this.isUtc = typeof isUtc == 'boolean' ? isUtc : dart.throw_(new ArgumentError(isUtc));
       this.millisecondsSinceEpoch = dart.as(_js_helper.checkInt(_js_helper.Primitives.valueFromDecomposedDate(year, month, day, hour, minute, second, millisecond, isUtc)), int);
     }
-    [_now]() {
+    _now() {
       this.isUtc = false;
       this.millisecondsSinceEpoch = _js_helper.Primitives.dateNow();
     }
-    static [_brokenDownDateToMillisecondsSinceEpoch](year, month, day, hour, minute, second, millisecond, isUtc) {
+    static _brokenDownDateToMillisecondsSinceEpoch(year, month, day, hour, minute, second, millisecond, isUtc) {
       return dart.as(_js_helper.Primitives.valueFromDecomposedDate(year, month, day, hour, minute, second, millisecond, isUtc), int);
     }
     get timeZoneName() {
       if (this.isUtc)
         return "UTC";
       return _js_helper.Primitives.getTimeZoneName(this);
     }
     get timeZoneOffset() {
       if (this.isUtc)
         return new Duration();
@@ skipping 21 matching lines @@
       return dart.as(_js_helper.Primitives.getMilliseconds(this), int);
     }
     get weekday() {
       return dart.as(_js_helper.Primitives.getWeekday(this), int);
     }
   }
   DateTime[dart.implements] = () => [Comparable];
   dart.defineNamedConstructor(DateTime, 'utc');
   dart.defineNamedConstructor(DateTime, 'now');
   dart.defineNamedConstructor(DateTime, 'fromMillisecondsSinceEpoch');
-  dart.defineNamedConstructor(DateTime, _internal$);
-  dart.defineNamedConstructor(DateTime, _now);
+  dart.defineNamedConstructor(DateTime, '_internal');
+  dart.defineNamedConstructor(DateTime, '_now');
   DateTime.MONDAY = 1;
   DateTime.TUESDAY = 2;
   DateTime.WEDNESDAY = 3;
   DateTime.THURSDAY = 4;
   DateTime.FRIDAY = 5;
   DateTime.SATURDAY = 6;
   DateTime.SUNDAY = 7;
   DateTime.DAYS_PER_WEEK = 7;
   DateTime.JANUARY = 1;
   DateTime.FEBRUARY = 2;
   DateTime.MARCH = 3;
   DateTime.APRIL = 4;
   DateTime.MAY = 5;
   DateTime.JUNE = 6;
   DateTime.JULY = 7;
   DateTime.AUGUST = 8;
   DateTime.SEPTEMBER = 9;
   DateTime.OCTOBER = 10;
   DateTime.NOVEMBER = 11;
   DateTime.DECEMBER = 12;
   DateTime.MONTHS_PER_YEAR = 12;
   DateTime._MAX_MILLISECONDS_SINCE_EPOCH = 8640000000000000;
-  let _parseError = dart.JsSymbol('_parseError');
-  let _onParseErrorInt = dart.JsSymbol('_onParseErrorInt');
-  let _onParseErrorDouble = dart.JsSymbol('_onParseErrorDouble');
   class num extends Object {
     static parse(input, onError) {
       if (onError === void 0)
         onError = null;
       let source = input.trim();
-      num[_parseError] = false;
-      let result = int.parse(source, {onError: num[_onParseErrorInt]});
-      if (!dart.notNull(num[_parseError]))
+      num._parseError = false;
+      let result = int.parse(source, {onError: num._onParseErrorInt});
+      if (!dart.notNull(num._parseError))
         return result;
-      num[_parseError] = false;
-      result = double.parse(source, num[_onParseErrorDouble]);
-      if (!dart.notNull(num[_parseError]))
+      num._parseError = false;
+      result = double.parse(source, num._onParseErrorDouble);
+      if (!dart.notNull(num._parseError))
         return result;
       if (onError == null)
         throw new FormatException(input);
       return onError(input);
     }
-    static [_onParseErrorInt](_) {
-      num[_parseError] = true;
+    static _onParseErrorInt(_) {
+      num._parseError = true;
       return 0;
     }
-    static [_onParseErrorDouble](_) {
-      num[_parseError] = true;
+    static _onParseErrorDouble(_) {
+      num._parseError = true;
       return 0.0;
     }
   }
   num[dart.implements] = () => [Comparable$(num)];
   num._parseError = false;
   class double extends num {
     static parse(source, onError) {
       if (onError === void 0)
         onError = null;
       return _js_helper.Primitives.parseDouble(source, onError);
     }
   }
   double.NAN = 0.0 / 0.0;
   double.INFINITY = 1.0 / 0.0;
   double.NEGATIVE_INFINITY = -dart.notNull(double.INFINITY);
   double.MIN_POSITIVE = 5e-324;
   double.MAX_FINITE = 1.7976931348623157e+308;
+  let _duration = dart.JsSymbol('_duration');
   let _microseconds = dart.JsSymbol('_microseconds');
-  let _duration = dart.JsSymbol('_duration');
   class Duration extends Object {
     Duration(opts) {
       let days = opts && 'days' in opts ? opts.days : 0;
       let hours = opts && 'hours' in opts ? opts.hours : 0;
       let minutes = opts && 'minutes' in opts ? opts.minutes : 0;
       let seconds = opts && 'seconds' in opts ? opts.seconds : 0;
       let milliseconds = opts && 'milliseconds' in opts ? opts.milliseconds : 0;
       let microseconds = opts && 'microseconds' in opts ? opts.microseconds : 0;
-      this[_microseconds](dart.notNull(days) * dart.notNull(Duration.MICROSECONDS_PER_DAY) + dart.notNull(hours) * dart.notNull(Duration.MICROSECONDS_PER_HOUR) + dart.notNull(minutes) * dart.notNull(Duration.MICROSECONDS_PER_MINUTE) + dart.notNull(seconds) * dart.notNull(Duration.MICROSECONDS_PER_SECOND) + dart.notNull(milliseconds) * dart.notNull(Duration.MICROSECONDS_PER_MILLISECOND) + dart.notNull(microseconds));
+      this._microseconds(dart.notNull(days) * dart.notNull(Duration.MICROSECONDS_PER_DAY) + dart.notNull(hours) * dart.notNull(Duration.MICROSECONDS_PER_HOUR) + dart.notNull(minutes) * dart.notNull(Duration.MICROSECONDS_PER_MINUTE) + dart.notNull(seconds) * dart.notNull(Duration.MICROSECONDS_PER_SECOND) + dart.notNull(milliseconds) * dart.notNull(Duration.MICROSECONDS_PER_MILLISECOND) + dart.notNull(microseconds));
     }
-    [_microseconds](duration) {
+    _microseconds(duration) {
       this[_duration] = duration;
     }
     ['+'](other) {
       return new Duration[_microseconds](dart.notNull(this[_duration]) + dart.notNull(other[_duration]));
     }
     ['-'](other) {
       return new Duration[_microseconds](dart.notNull(this[_duration]) - dart.notNull(other[_duration]));
     }
     ['*'](factor) {
       return new Duration[_microseconds]((dart.notNull(this[_duration]) * dart.notNull(factor)).round());
@@ skipping 77 matching lines @@
       return dart.notNull(this[_duration]) < 0;
     }
     abs() {
       return new Duration[_microseconds](this[_duration].abs());
     }
     ['unary-']() {
       return new Duration[_microseconds](-dart.notNull(this[_duration]));
     }
   }
   Duration[dart.implements] = () => [Comparable$(Duration)];
-  dart.defineNamedConstructor(Duration, _microseconds);
+  dart.defineNamedConstructor(Duration, '_microseconds');
   Duration.MICROSECONDS_PER_MILLISECOND = 1000;
   Duration.MILLISECONDS_PER_SECOND = 1000;
   Duration.SECONDS_PER_MINUTE = 60;
   Duration.MINUTES_PER_HOUR = 60;
   Duration.HOURS_PER_DAY = 24;
   Duration.MICROSECONDS_PER_SECOND = dart.notNull(Duration.MICROSECONDS_PER_MILLISECOND) * dart.notNull(Duration.MILLISECONDS_PER_SECOND);
   Duration.MICROSECONDS_PER_MINUTE = dart.notNull(Duration.MICROSECONDS_PER_SECOND) * dart.notNull(Duration.SECONDS_PER_MINUTE);
   Duration.MICROSECONDS_PER_HOUR = dart.notNull(Duration.MICROSECONDS_PER_MINUTE) * dart.notNull(Duration.MINUTES_PER_HOUR);
   Duration.MICROSECONDS_PER_DAY = dart.notNull(Duration.MICROSECONDS_PER_HOUR) * dart.notNull(Duration.HOURS_PER_DAY);
   Duration.MILLISECONDS_PER_MINUTE = dart.notNull(Duration.MILLISECONDS_PER_SECOND) * dart.notNull(Duration.SECONDS_PER_MINUTE);
   Duration.MILLISECONDS_PER_HOUR = dart.notNull(Duration.MILLISECONDS_PER_MINUTE) * dart.notNull(Duration.MINUTES_PER_HOUR);
   Duration.MILLISECONDS_PER_DAY = dart.notNull(Duration.MILLISECONDS_PER_HOUR) * dart.notNull(Duration.HOURS_PER_DAY);
   Duration.SECONDS_PER_HOUR = dart.notNull(Duration.SECONDS_PER_MINUTE) * dart.notNull(Duration.MINUTES_PER_HOUR);
   Duration.SECONDS_PER_DAY = dart.notNull(Duration.SECONDS_PER_HOUR) * dart.notNull(Duration.HOURS_PER_DAY);
   Duration.MINUTES_PER_DAY = dart.notNull(Duration.MINUTES_PER_HOUR) * dart.notNull(Duration.HOURS_PER_DAY);
   Duration.ZERO = dart.const(new Duration({seconds: 0}));
-  let _stringToSafeString = dart.JsSymbol('_stringToSafeString');
-  let _objectToString = dart.JsSymbol('_objectToString');
   class Error extends Object {
     Error() {
     }
     static safeToString(object) {
       if (dart.is(object, num) || typeof object == 'boolean' || dart.notNull(null == object)) {
         return dart.toString(object);
       }
       if (typeof object == 'string') {
-        return Error[_stringToSafeString](object);
+        return Error._stringToSafeString(object);
       }
-      return Error[_objectToString](object);
+      return Error._objectToString(object);
     }
-    static [_stringToSafeString](string) {
+    static _stringToSafeString(string) {
       return _js_helper.jsonEncodeNative(string);
     }
-    static [_objectToString](object) {
+    static _objectToString(object) {
       return _js_helper.Primitives.objectToString(object);
     }
     get stackTrace() {
       return _js_helper.Primitives.extractStackTrace(this);
     }
   }
   class AssertionError extends Error {}
   class TypeError extends AssertionError {}
   class CastError extends Error {}
   class NullThrownError extends Error {
@@ skipping 433 matching lines @@
   }
   FormatException[dart.implements] = () => [Exception];
   class IntegerDivisionByZeroException extends Object {
     IntegerDivisionByZeroException() {
     }
     toString() {
       return "IntegerDivisionByZeroException";
     }
   }
   IntegerDivisionByZeroException[dart.implements] = () => [Exception];
-  let _EXPANDO_PROPERTY_NAME = dart.JsSymbol('_EXPANDO_PROPERTY_NAME');
   let _getKey = dart.JsSymbol('_getKey');
-  let _KEY_PROPERTY_NAME = dart.JsSymbol('_KEY_PROPERTY_NAME');
-  let _keyCount = dart.JsSymbol('_keyCount');
   let Expando$ = dart.generic(function(T) {
     class Expando extends Object {
       Expando(name) {
         if (name === void 0)
           name = null;
         this.name = name;
       }
       toString() {
         return `Expando:${this.name}`;
       }
       get(object) {
-        let values = _js_helper.Primitives.getProperty(object, Expando[_EXPANDO_PROPERTY_NAME]);
+        let values = _js_helper.Primitives.getProperty(object, Expando._EXPANDO_PROPERTY_NAME);
         return dart.as(values == null ? null : _js_helper.Primitives.getProperty(values, this[_getKey]()), T);
       }
       set(object, value) {
-        let values = _js_helper.Primitives.getProperty(object, Expando[_EXPANDO_PROPERTY_NAME]);
+        let values = _js_helper.Primitives.getProperty(object, Expando._EXPANDO_PROPERTY_NAME);
         if (values == null) {
           values = new Object();
-          _js_helper.Primitives.setProperty(object, Expando[_EXPANDO_PROPERTY_NAME], values);
+          _js_helper.Primitives.setProperty(object, Expando._EXPANDO_PROPERTY_NAME, values);
         }
         _js_helper.Primitives.setProperty(values, this[_getKey](), value);
       }
       [_getKey]() {
-        let key = dart.as(_js_helper.Primitives.getProperty(this, Expando[_KEY_PROPERTY_NAME]), String);
+        let key = dart.as(_js_helper.Primitives.getProperty(this, Expando._KEY_PROPERTY_NAME), String);
         if (key == null) {
           key = `expando$key$${(() => {
-            let x = Expando[_keyCount];
-            Expando[_keyCount] = dart.notNull(x) + 1;
+            let x = Expando._keyCount;
+            Expando._keyCount = dart.notNull(x) + 1;
             return x;
           })()}`;
-          _js_helper.Primitives.setProperty(this, Expando[_KEY_PROPERTY_NAME], key);
+          _js_helper.Primitives.setProperty(this, Expando._KEY_PROPERTY_NAME, key);
         }
         return key;
       }
     }
     Expando._KEY_PROPERTY_NAME = 'expando$key';
     Expando._EXPANDO_PROPERTY_NAME = 'expando$values';
     Expando._keyCount = 0;
     return Expando;
   });
   let Expando = Expando$();
@@ skipping 53 matching lines @@
     }
     dart.defineNamedConstructor(Iterable, 'generate');
     return Iterable;
   });
   let Iterable = Iterable$();
   let _Generator$ = dart.generic(function(E) {
     let _Generator = dart.typedef('_Generator', () => dart.functionType(E, [int]));
     return _Generator;
   });
   let _Generator = _Generator$();
-  let _id = dart.JsSymbol('_id');
   let _end = dart.JsSymbol('_end');
   let _start = dart.JsSymbol('_start');
   let _generator = dart.JsSymbol('_generator');
   let $iterator = dart.JsSymbol('$iterator');
   let $skip = dart.JsSymbol('$skip');
   let $take = dart.JsSymbol('$take');
   let _GeneratorIterable$ = dart.generic(function(E) {
     class _GeneratorIterable extends collection.IterableBase$(E) {
       _GeneratorIterable(end, generator) {
         this[_end] = end;
         this[_start] = 0;
-        this[_generator] = dart.as(generator != null ? generator : _GeneratorIterable[_id], _Generator$(E));
+        this[_generator] = dart.as(generator != null ? generator : _GeneratorIterable._id, _Generator$(E));
         super.IterableBase();
       }
       slice(start, end, generator) {
         this[_start] = start;
         this[_end] = end;
         this[_generator] = generator;
         super.IterableBase();
       }
       get [$iterator]() {
         return new (_GeneratorIterator$(E))(this[_start], this[_end], this[_generator]);
@@ skipping 12 matching lines @@
       }
       [$take](count) {
         RangeError.checkNotNegative(count, "count");
         if (count == 0)
           return new (_internal.EmptyIterable$(E))();
         let newEnd = dart.notNull(this[_start]) + dart.notNull(count);
         if (dart.notNull(newEnd) >= dart.notNull(this[_end]))
           return this;
         return new exports._GeneratorIterable$(E).slice(this[_start], newEnd, this[_generator]);
       }
-      static [_id](n) {
+      static _id(n) {
         return n;
       }
     }
     _GeneratorIterable[dart.implements] = () => [_internal.EfficientLength];
     dart.defineNamedConstructor(_GeneratorIterable, 'slice');
     return _GeneratorIterable;
   });
   dart.defineLazyClassGeneric(exports, '_GeneratorIterable', {get: _GeneratorIterable$});
   let _index = dart.JsSymbol('_index');
   let _current = dart.JsSymbol('_current');
@@ skipping 447 matching lines @@
         return new collection.LinkedHashMap$(K, V).fromIterables(keys, values);
       }
     }
     dart.defineNamedConstructor(Map, 'from');
     dart.defineNamedConstructor(Map, 'identity');
     dart.defineNamedConstructor(Map, 'fromIterable');
     dart.defineNamedConstructor(Map, 'fromIterables');
     return Map;
   });
   let Map = Map$();
-  let _uninstantiable = dart.JsSymbol('_uninstantiable');
   class Null extends Object {
-    [_uninstantiable]() {
+    _uninstantiable() {
       throw new UnsupportedError('class Null cannot be instantiated');
     }
     toString() {
       return "null";
     }
   }
-  dart.defineNamedConstructor(Null, _uninstantiable);
+  dart.defineNamedConstructor(Null, '_uninstantiable');
   class Pattern extends Object {}
   // Function print: (Object) → void
   function print(object) {
     let line = `${object}`;
     if (_internal.printToZone == null) {
       _internal.printToConsole(line);
     } else {
       dart.dcall(_internal.printToZone, line);
     }
   }
@@ skipping 23 matching lines @@
     dart.defineNamedConstructor(Set, 'from');
     return Set;
   });
   dart.defineLazyClassGeneric(exports, 'Set', {get: Set$});
   let Sink$ = dart.generic(function(T) {
     class Sink extends Object {}
     return Sink;
   });
   let Sink = Sink$();
   class StackTrace extends Object {}
-  let _frequency = dart.JsSymbol('_frequency');
   let _stop = dart.JsSymbol('_stop');
-  let _initTicker = dart.JsSymbol('_initTicker');
   class Stopwatch extends Object {
     get frequency() {
-      return Stopwatch[_frequency];
+      return Stopwatch._frequency;
     }
     Stopwatch() {
       this[_start] = null;
       this[_stop] = null;
-      Stopwatch[_initTicker]();
+      Stopwatch._initTicker();
     }
     start() {
       if (this.isRunning)
         return;
       if (this[_start] == null) {
-        this[_start] = Stopwatch[_now]();
+        this[_start] = Stopwatch._now();
       } else {
-        this[_start] = dart.notNull(Stopwatch[_now]()) - (dart.notNull(this[_stop]) - dart.notNull(this[_start]));
+        this[_start] = dart.notNull(Stopwatch._now()) - (dart.notNull(this[_stop]) - dart.notNull(this[_start]));
         this[_stop] = null;
       }
     }
     stop() {
       if (!dart.notNull(this.isRunning))
         return;
-      this[_stop] = Stopwatch[_now]();
+      this[_stop] = Stopwatch._now();
     }
     reset() {
       if (this[_start] == null)
         return;
-      this[_start] = Stopwatch[_now]();
+      this[_start] = Stopwatch._now();
       if (this[_stop] != null) {
         this[_stop] = this[_start];
       }
     }
     get elapsedTicks() {
       if (this[_start] == null) {
         return 0;
       }
-      return this[_stop] == null ? dart.notNull(Stopwatch[_now]()) - dart.notNull(this[_start]) : dart.notNull(this[_stop]) - dart.notNull(this[_start]);
+      return this[_stop] == null ? dart.notNull(Stopwatch._now()) - dart.notNull(this[_start]) : dart.notNull(this[_stop]) - dart.notNull(this[_start]);
     }
     get elapsed() {
       return new Duration({microseconds: this.elapsedMicroseconds});
     }
     get elapsedMicroseconds() {
       return (dart.notNull(this.elapsedTicks) * 1000000 / dart.notNull(this.frequency)).truncate();
     }
     get elapsedMilliseconds() {
       return (dart.notNull(this.elapsedTicks) * 1000 / dart.notNull(this.frequency)).truncate();
     }
     get isRunning() {
       return this[_start] != null && this[_stop] == null;
     }
-    static [_initTicker]() {
+    static _initTicker() {
       _js_helper.Primitives.initTicker();
-      Stopwatch[_frequency] = _js_helper.Primitives.timerFrequency;
+      Stopwatch._frequency = _js_helper.Primitives.timerFrequency;
     }
-    static [_now]() {
+    static _now() {
       return dart.as(dart.dcall(_js_helper.Primitives.timerTicks), int);
     }
   }
   Stopwatch._frequency = null;
-  let _stringFromIterable = dart.JsSymbol('_stringFromIterable');
   class String extends Object {
     fromCharCodes(charCodes, start, end) {
       if (start === void 0)
         start = 0;
       if (end === void 0)
         end = null;
       if (!dart.is(charCodes, _interceptors.JSArray)) {
-        return String[_stringFromIterable](charCodes, start, end);
+        return String._stringFromIterable(charCodes, start, end);
       }
       let list = dart.as(charCodes, List);
       let len = list[$length];
       if (dart.notNull(start) < 0 || dart.notNull(start) > dart.notNull(len)) {
         throw new RangeError.range(start, 0, len);
       }
       if (end == null) {
         end = len;
       } else if (dart.notNull(end) < dart.notNull(start) || dart.notNull(end) > dart.notNull(len)) {
         throw new RangeError.range(end, start, len);
       }
       if (dart.notNull(start) > 0 || dart.notNull(end) < dart.notNull(len)) {
         list = list[$sublist](start, end);
       }
       return _js_helper.Primitives.stringFromCharCodes(list);
     }
     fromCharCode(charCode) {
       return _js_helper.Primitives.stringFromCharCode(charCode);
     }
     fromEnvironment(name, opts) {
       let defaultValue = opts && 'defaultValue' in opts ? opts.defaultValue : null;
       throw new UnsupportedError('String.fromEnvironment can only be used as a const constructor');
     }
-    static [_stringFromIterable](charCodes, start, end) {
+    static _stringFromIterable(charCodes, start, end) {
       if (dart.notNull(start) < 0)
         throw new RangeError.range(start, 0, charCodes[$length]);
       if (end != null && dart.notNull(end) < dart.notNull(start)) {
         throw new RangeError.range(end, start, charCodes[$length]);
       }
       let it = charCodes[$iterator];
       for (let i = 0; dart.notNull(i) < dart.notNull(start); i = dart.notNull(i) + 1) {
         if (!dart.notNull(it.moveNext())) {
           throw new RangeError.range(start, 0, i);
         }
@@ skipping 215 matching lines @@
   class Symbol extends Object {
     Symbol(name) {
       return new _internal.Symbol(name);
     }
   }
   class Type extends Object {}
   let _writeAuthority = dart.JsSymbol('_writeAuthority');
   let _userInfo = dart.JsSymbol('_userInfo');
   let _host = dart.JsSymbol('_host');
   let _port = dart.JsSymbol('_port');
-  let _defaultPort = dart.JsSymbol('_defaultPort');
   let _path = dart.JsSymbol('_path');
   let _query = dart.JsSymbol('_query');
   let _fragment = dart.JsSymbol('_fragment');
-  let _regNameTable = dart.JsSymbol('_regNameTable');
-  let _SLASH = dart.JsSymbol('_SLASH');
-  let _QUESTION = dart.JsSymbol('_QUESTION');
-  let _NUMBER_SIGN = dart.JsSymbol('_NUMBER_SIGN');
-  let _AT_SIGN = dart.JsSymbol('_AT_SIGN');
-  let _COLON = dart.JsSymbol('_COLON');
-  let _LEFT_BRACKET = dart.JsSymbol('_LEFT_BRACKET');
-  let _makeUserInfo = dart.JsSymbol('_makeUserInfo');
-  let _ZERO = dart.JsSymbol('_ZERO');
-  let _NINE = dart.JsSymbol('_NINE');
-  let _fail = dart.JsSymbol('_fail');
-  let _makePort = dart.JsSymbol('_makePort');
-  let _makeHost = dart.JsSymbol('_makeHost');
-  let _makeScheme = dart.JsSymbol('_makeScheme');
-  let _makePath = dart.JsSymbol('_makePath');
-  let _makeQuery = dart.JsSymbol('_makeQuery');
-  let _makeFragment = dart.JsSymbol('_makeFragment');
+  let _internal$ = dart.JsSymbol('_internal');
   let _pathSegments = dart.JsSymbol('_pathSegments');
   let _queryParameters = dart.JsSymbol('_queryParameters');
-  let _stringOrNullLength = dart.JsSymbol('_stringOrNullLength');
-  let _makeHttpUri = dart.JsSymbol('_makeHttpUri');
-  let _RIGHT_BRACKET = dart.JsSymbol('_RIGHT_BRACKET');
-  let _isWindows = dart.JsSymbol('_isWindows');
-  let _makeWindowsFileUrl = dart.JsSymbol('_makeWindowsFileUrl');
-  let _makeFileUri = dart.JsSymbol('_makeFileUri');
-  let _checkNonWindowsPathReservedCharacters = dart.JsSymbol('_checkNonWindowsPathReservedCharacters');
-  let _checkWindowsPathReservedCharacters = dart.JsSymbol('_checkWindowsPathReservedCharacters');
-  let _checkWindowsDriveLetter = dart.JsSymbol('_checkWindowsDriveLetter');
-  let _UPPER_CASE_A = dart.JsSymbol('_UPPER_CASE_A');
-  let _UPPER_CASE_Z = dart.JsSymbol('_UPPER_CASE_Z');
-  let _LOWER_CASE_A = dart.JsSymbol('_LOWER_CASE_A');
-  let _LOWER_CASE_Z = dart.JsSymbol('_LOWER_CASE_Z');
-  let _BACKSLASH = dart.JsSymbol('_BACKSLASH');
-  let _normalizeRegName = dart.JsSymbol('_normalizeRegName');
-  let _isRegNameChar = dart.JsSymbol('_isRegNameChar');
-  let _PERCENT = dart.JsSymbol('_PERCENT');
-  let _normalizeEscape = dart.JsSymbol('_normalizeEscape');
-  let _isGeneralDelimiter = dart.JsSymbol('_isGeneralDelimiter');
-  let _escapeChar = dart.JsSymbol('_escapeChar');
-  let _isAlphabeticCharacter = dart.JsSymbol('_isAlphabeticCharacter');
-  let _isSchemeCharacter = dart.JsSymbol('_isSchemeCharacter');
-  let _normalize = dart.JsSymbol('_normalize');
-  let _userinfoTable = dart.JsSymbol('_userinfoTable');
-  let _pathCharOrSlashTable = dart.JsSymbol('_pathCharOrSlashTable');
-  let _uriEncode = dart.JsSymbol('_uriEncode');
-  let _pathCharTable = dart.JsSymbol('_pathCharTable');
-  let _queryCharTable = dart.JsSymbol('_queryCharTable');
-  let _isHexDigit = dart.JsSymbol('_isHexDigit');
-  let _LOWER_CASE_F = dart.JsSymbol('_LOWER_CASE_F');
-  let _hexValue = dart.JsSymbol('_hexValue');
-  let _isUnreservedChar = dart.JsSymbol('_isUnreservedChar');
-  let _unreservedTable = dart.JsSymbol('_unreservedTable');
-  let _schemeTable = dart.JsSymbol('_schemeTable');
-  let _genDelimitersTable = dart.JsSymbol('_genDelimitersTable');
   let _merge = dart.JsSymbol('_merge');
-  let _DOT = dart.JsSymbol('_DOT');
   let _hasDotSegments = dart.JsSymbol('_hasDotSegments');
   let _removeDotSegments = dart.JsSymbol('_removeDotSegments');
   let _toWindowsFilePath = dart.JsSymbol('_toWindowsFilePath');
   let _toFilePath = dart.JsSymbol('_toFilePath');
   let _isPathAbsolute = dart.JsSymbol('_isPathAbsolute');
-  let _addIfNonEmpty = dart.JsSymbol('_addIfNonEmpty');
-  let _unreserved2396Table = dart.JsSymbol('_unreserved2396Table');
-  let _uriDecode = dart.JsSymbol('_uriDecode');
-  let _encodeFullTable = dart.JsSymbol('_encodeFullTable');
-  let _SPACE = dart.JsSymbol('_SPACE');
-  let _PLUS = dart.JsSymbol('_PLUS');
-  let _hexCharPairToByte = dart.JsSymbol('_hexCharPairToByte');
   class Uri extends Object {
     get authority() {
       if (!dart.notNull(this.hasAuthority))
         return "";
       let sb = new StringBuffer();
       this[_writeAuthority](sb);
       return dart.toString(sb);
     }
     get userInfo() {
       return this[_userInfo];
     }
     get host() {
       if (this[_host] == null)
         return "";
       if (this[_host].startsWith('[')) {
         return this[_host].substring(1, dart.notNull(this[_host].length) - 1);
       }
       return this[_host];
     }
     get port() {
       if (this[_port] == null)
-        return Uri[_defaultPort](this.scheme);
+        return Uri._defaultPort(this.scheme);
       return this[_port];
     }
-    static [_defaultPort](scheme) {
+    static _defaultPort(scheme) {
       if (scheme == "http")
         return 80;
       if (scheme == "https")
         return 443;
       return 0;
     }
     get path() {
       return this[_path];
     }
     get query() {
       return this[_query] == null ? "" : this[_query];
     }
     get fragment() {
       return this[_fragment] == null ? "" : this[_fragment];
     }
     static parse(uri) {
       // Function isRegName: (int) → bool
       function isRegName(ch) {
-        return dart.notNull(ch) < 128 && dart.notNull(!dart.equals(dart.dsend(Uri[_regNameTable][$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
+        return dart.notNull(ch) < 128 && dart.notNull(!dart.equals(dart.dsend(Uri._regNameTable[$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
       }
       let EOI = -1;
       let scheme = "";
       let userinfo = "";
       let host = null;
       let port = null;
       let path = null;
       let query = null;
       let fragment = null;
       let index = 0;
       let pathStart = 0;
       let char = EOI;
       // Function parseAuth: () → void
       function parseAuth() {
         if (index == uri.length) {
           char = EOI;
           return;
         }
         let authStart = index;
         let lastColon = -1;
         let lastAt = -1;
         char = uri.codeUnitAt(index);
         while (dart.notNull(index) < dart.notNull(uri.length)) {
           char = uri.codeUnitAt(index);
-          if (char == Uri[_SLASH] || char == Uri[_QUESTION] || char == Uri[_NUMBER_SIGN]) {
+          if (char == Uri._SLASH || char == Uri._QUESTION || char == Uri._NUMBER_SIGN) {
             break;
           }
-          if (char == Uri[_AT_SIGN]) {
+          if (char == Uri._AT_SIGN) {
             lastAt = index;
             lastColon = -1;
-          } else if (char == Uri[_COLON]) {
+          } else if (char == Uri._COLON) {
             lastColon = index;
-          } else if (char == Uri[_LEFT_BRACKET]) {
+          } else if (char == Uri._LEFT_BRACKET) {
             lastColon = -1;
             let endBracket = uri.indexOf(']', dart.notNull(index) + 1);
             if (endBracket == -1) {
               index = uri.length;
               char = EOI;
               break;
             } else {
               index = endBracket;
             }
           }
           index = dart.notNull(index) + 1;
           char = EOI;
         }
         let hostStart = authStart;
         let hostEnd = index;
         if (dart.notNull(lastAt) >= 0) {
-          userinfo = Uri[_makeUserInfo](uri, authStart, lastAt);
+          userinfo = Uri._makeUserInfo(uri, authStart, lastAt);
           hostStart = dart.notNull(lastAt) + 1;
         }
         if (dart.notNull(lastColon) >= 0) {
           let portNumber = null;
           if (dart.notNull(lastColon) + 1 < dart.notNull(index)) {
             portNumber = 0;
             for (let i = dart.notNull(lastColon) + 1; dart.notNull(i) < dart.notNull(index); i = dart.notNull(i) + 1) {
               let digit = uri.codeUnitAt(i);
-              if (dart.notNull(Uri[_ZERO]) > dart.notNull(digit) || dart.notNull(Uri[_NINE]) < dart.notNull(digit)) {
-                Uri[_fail](uri, i, "Invalid port number");
+              if (dart.notNull(Uri._ZERO) > dart.notNull(digit) || dart.notNull(Uri._NINE) < dart.notNull(digit)) {
+                Uri._fail(uri, i, "Invalid port number");
               }
-              portNumber = dart.notNull(portNumber) * 10 + (dart.notNull(digit) - dart.notNull(Uri[_ZERO]));
+              portNumber = dart.notNull(portNumber) * 10 + (dart.notNull(digit) - dart.notNull(Uri._ZERO));
             }
           }
-          port = Uri[_makePort](portNumber, scheme);
+          port = Uri._makePort(portNumber, scheme);
           hostEnd = lastColon;
         }
-        host = Uri[_makeHost](uri, hostStart, hostEnd, true);
+        host = Uri._makeHost(uri, hostStart, hostEnd, true);
         if (dart.notNull(index) < dart.notNull(uri.length)) {
           char = uri.codeUnitAt(index);
         }
       }
       let NOT_IN_PATH = 0;
       let IN_PATH = 1;
       let ALLOW_AUTH = 2;
       let state = NOT_IN_PATH;
       let i = index;
       while (dart.notNull(i) < dart.notNull(uri.length)) {
         char = uri.codeUnitAt(i);
-        if (char == Uri[_QUESTION] || char == Uri[_NUMBER_SIGN]) {
+        if (char == Uri._QUESTION || char == Uri._NUMBER_SIGN) {
           state = NOT_IN_PATH;
           break;
         }
-        if (char == Uri[_SLASH]) {
+        if (char == Uri._SLASH) {
           state = i == 0 ? ALLOW_AUTH : IN_PATH;
           break;
         }
-        if (char == Uri[_COLON]) {
+        if (char == Uri._COLON) {
           if (i == 0)
-            Uri[_fail](uri, 0, "Invalid empty scheme");
-          scheme = Uri[_makeScheme](uri, i);
+            Uri._fail(uri, 0, "Invalid empty scheme");
+          scheme = Uri._makeScheme(uri, i);
           i = dart.notNull(i) + 1;
           pathStart = i;
           if (i == uri.length) {
             char = EOI;
             state = NOT_IN_PATH;
           } else {
             char = uri.codeUnitAt(i);
-            if (char == Uri[_QUESTION] || char == Uri[_NUMBER_SIGN]) {
+            if (char == Uri._QUESTION || char == Uri._NUMBER_SIGN) {
               state = NOT_IN_PATH;
-            } else if (char == Uri[_SLASH]) {
+            } else if (char == Uri._SLASH) {
               state = ALLOW_AUTH;
             } else {
               state = IN_PATH;
             }
           }
           break;
         }
         i = dart.notNull(i) + 1;
         char = EOI;
       }
       index = i;
       if (state == ALLOW_AUTH) {
-        dart.assert(char == Uri[_SLASH]);
+        dart.assert(char == Uri._SLASH);
         index = dart.notNull(index) + 1;
         if (index == uri.length) {
           char = EOI;
           state = NOT_IN_PATH;
         } else {
           char = uri.codeUnitAt(index);
-          if (char == Uri[_SLASH]) {
+          if (char == Uri._SLASH) {
             index = dart.notNull(index) + 1;
             parseAuth();
             pathStart = index;
           }
-          if (char == Uri[_QUESTION] || char == Uri[_NUMBER_SIGN] || char == EOI) {
+          if (char == Uri._QUESTION || char == Uri._NUMBER_SIGN || char == EOI) {
             state = NOT_IN_PATH;
           } else {
             state = IN_PATH;
           }
         }
       }
       dart.assert(state == IN_PATH || state == NOT_IN_PATH);
       if (state == IN_PATH) {
         while ((index = dart.notNull(index) + 1) < dart.notNull(uri.length)) {
           char = uri.codeUnitAt(index);
-          if (char == Uri[_QUESTION] || char == Uri[_NUMBER_SIGN]) {
+          if (char == Uri._QUESTION || char == Uri._NUMBER_SIGN) {
             break;
           }
           char = EOI;
         }
         state = NOT_IN_PATH;
       }
       dart.assert(state == NOT_IN_PATH);
       let isFile = scheme == "file";
       let ensureLeadingSlash = host != null;
-      path = Uri[_makePath](uri, pathStart, index, null, ensureLeadingSlash, isFile);
-      if (char == Uri[_QUESTION]) {
+      path = Uri._makePath(uri, pathStart, index, null, ensureLeadingSlash, isFile);
+      if (char == Uri._QUESTION) {
         let numberSignIndex = uri.indexOf('#', dart.notNull(index) + 1);
         if (dart.notNull(numberSignIndex) < 0) {
-          query = Uri[_makeQuery](uri, dart.notNull(index) + 1, uri.length, null);
+          query = Uri._makeQuery(uri, dart.notNull(index) + 1, uri.length, null);
         } else {
-          query = Uri[_makeQuery](uri, dart.notNull(index) + 1, numberSignIndex, null);
-          fragment = Uri[_makeFragment](uri, dart.notNull(numberSignIndex) + 1, uri.length);
+          query = Uri._makeQuery(uri, dart.notNull(index) + 1, numberSignIndex, null);
+          fragment = Uri._makeFragment(uri, dart.notNull(numberSignIndex) + 1, uri.length);
         }
-      } else if (char == Uri[_NUMBER_SIGN]) {
-        fragment = Uri[_makeFragment](uri, dart.notNull(index) + 1, uri.length);
+      } else if (char == Uri._NUMBER_SIGN) {
+        fragment = Uri._makeFragment(uri, dart.notNull(index) + 1, uri.length);
       }
       return new Uri[_internal$](scheme, userinfo, host, port, path, query, fragment);
     }
-    static [_fail](uri, index, message) {
+    static _fail(uri, index, message) {
       throw new FormatException(message, uri, index);
     }
-    [_internal$](scheme, userInfo, host, port, path, query, fragment) {
+    _internal(scheme, userInfo, host, port, path, query, fragment) {
       this.scheme = scheme;
       this[_userInfo] = userInfo;
       this[_host] = host;
       this[_port] = port;
       this[_path] = path;
       this[_query] = query;
       this[_fragment] = fragment;
       this[_pathSegments] = null;
       this[_queryParameters] = null;
     }
     Uri(opts) {
       let scheme = opts && 'scheme' in opts ? opts.scheme : "";
       let userInfo = opts && 'userInfo' in opts ? opts.userInfo : "";
       let host = opts && 'host' in opts ? opts.host : null;
       let port = opts && 'port' in opts ? opts.port : null;
       let path = opts && 'path' in opts ? opts.path : null;
       let pathSegments = opts && 'pathSegments' in opts ? opts.pathSegments : null;
       let query = opts && 'query' in opts ? opts.query : null;
       let queryParameters = opts && 'queryParameters' in opts ? opts.queryParameters : null;
       let fragment = opts && 'fragment' in opts ? opts.fragment : null;
-      scheme = Uri[_makeScheme](scheme, Uri[_stringOrNullLength](scheme));
-      userInfo = Uri[_makeUserInfo](userInfo, 0, Uri[_stringOrNullLength](userInfo));
-      host = Uri[_makeHost](host, 0, Uri[_stringOrNullLength](host), false);
+      scheme = Uri._makeScheme(scheme, Uri._stringOrNullLength(scheme));
+      userInfo = Uri._makeUserInfo(userInfo, 0, Uri._stringOrNullLength(userInfo));
+      host = Uri._makeHost(host, 0, Uri._stringOrNullLength(host), false);
       if (query == "")
         query = null;
-      query = Uri[_makeQuery](query, 0, Uri[_stringOrNullLength](query), queryParameters);
-      fragment = Uri[_makeFragment](fragment, 0, Uri[_stringOrNullLength](fragment));
-      port = Uri[_makePort](port, scheme);
+      query = Uri._makeQuery(query, 0, Uri._stringOrNullLength(query), queryParameters);
+      fragment = Uri._makeFragment(fragment, 0, Uri._stringOrNullLength(fragment));
+      port = Uri._makePort(port, scheme);
       let isFile = scheme == "file";
       if (host == null && (dart.notNull(userInfo.isNotEmpty) || port != null || dart.notNull(isFile))) {
         host = "";
       }
       let ensureLeadingSlash = host != null;
-      path = Uri[_makePath](path, 0, Uri[_stringOrNullLength](path), pathSegments, ensureLeadingSlash, isFile);
+      path = Uri._makePath(path, 0, Uri._stringOrNullLength(path), pathSegments, ensureLeadingSlash, isFile);
       return new Uri[_internal$](scheme, userInfo, host, port, path, query, fragment);
     }
     http(authority, unencodedPath, queryParameters) {
       if (queryParameters === void 0)
         queryParameters = null;
-      return Uri[_makeHttpUri]("http", authority, unencodedPath, queryParameters);
+      return Uri._makeHttpUri("http", authority, unencodedPath, queryParameters);
     }
     https(authority, unencodedPath, queryParameters) {
       if (queryParameters === void 0)
         queryParameters = null;
-      return Uri[_makeHttpUri]("https", authority, unencodedPath, queryParameters);
+      return Uri._makeHttpUri("https", authority, unencodedPath, queryParameters);
     }
-    static [_makeHttpUri](scheme, authority, unencodedPath, queryParameters) {
+    static _makeHttpUri(scheme, authority, unencodedPath, queryParameters) {
       let userInfo = "";
       let host = null;
       let port = null;
       if (authority != null && dart.notNull(authority.isNotEmpty)) {
         let hostStart = 0;
         let hasUserInfo = false;
         for (let i = 0; dart.notNull(i) < dart.notNull(authority.length); i = dart.notNull(i) + 1) {
-          if (authority.codeUnitAt(i) == Uri[_AT_SIGN]) {
+          if (authority.codeUnitAt(i) == Uri._AT_SIGN) {
             hasUserInfo = true;
             userInfo = authority.substring(0, i);
             hostStart = dart.notNull(i) + 1;
             break;
           }
         }
         let hostEnd = hostStart;
-        if (dart.notNull(hostStart) < dart.notNull(authority.length) && authority.codeUnitAt(hostStart) == Uri[_LEFT_BRACKET]) {
+        if (dart.notNull(hostStart) < dart.notNull(authority.length) && authority.codeUnitAt(hostStart) == Uri._LEFT_BRACKET) {
           for (; dart.notNull(hostEnd) < dart.notNull(authority.length); hostEnd = dart.notNull(hostEnd) + 1) {
-            if (authority.codeUnitAt(hostEnd) == Uri[_RIGHT_BRACKET])
+            if (authority.codeUnitAt(hostEnd) == Uri._RIGHT_BRACKET)
               break;
           }
           if (hostEnd == authority.length) {
             throw new FormatException("Invalid IPv6 host entry.", authority, hostStart);
           }
           Uri.parseIPv6Address(authority, dart.notNull(hostStart) + 1, hostEnd);
           hostEnd = dart.notNull(hostEnd) + 1;
-          if (hostEnd != authority.length && authority.codeUnitAt(hostEnd) != Uri[_COLON]) {
+          if (hostEnd != authority.length && authority.codeUnitAt(hostEnd) != Uri._COLON) {
             throw new FormatException("Invalid end of authority", authority, hostEnd);
           }
         }
         let hasPort = false;
         for (; dart.notNull(hostEnd) < dart.notNull(authority.length); hostEnd = dart.notNull(hostEnd) + 1) {
-          if (authority.codeUnitAt(hostEnd) == Uri[_COLON]) {
+          if (authority.codeUnitAt(hostEnd) == Uri._COLON) {
             let portString = authority.substring(dart.notNull(hostEnd) + 1);
             if (portString.isNotEmpty)
               port = int.parse(portString);
             break;
           }
         }
         host = authority.substring(hostStart, hostEnd);
       }
       return new Uri({scheme: scheme, userInfo: userInfo, host: dart.as(host, String), port: dart.as(port, int), pathSegments: unencodedPath.split("/"), queryParameters: queryParameters});
     }
     file(path, opts) {
       let windows = opts && 'windows' in opts ? opts.windows : null;
-      windows = windows == null ? Uri[_isWindows] : windows;
-      return dart.as(windows ? Uri[_makeWindowsFileUrl](path) : Uri[_makeFileUri](path), Uri);
+      windows = windows == null ? Uri._isWindows : windows;
+      return dart.as(windows ? Uri._makeWindowsFileUrl(path) : Uri._makeFileUri(path), Uri);
     }
     static get base() {
       let uri = _js_helper.Primitives.currentUri();
       if (uri != null)
         return Uri.parse(uri);
       throw new UnsupportedError("'Uri.base' is not supported");
     }
-    static get [_isWindows]() {
+    static get _isWindows() {
       return false;
     }
-    static [_checkNonWindowsPathReservedCharacters](segments, argumentError) {
+    static _checkNonWindowsPathReservedCharacters(segments, argumentError) {
       segments[$forEach](segment => {
         if (dart.dsend(segment, 'contains', "/")) {
           if (argumentError) {
             throw new ArgumentError(`Illegal path character ${segment}`);
           } else {
             throw new UnsupportedError(`Illegal path character ${segment}`);
           }
         }
       });
     }
-    static [_checkWindowsPathReservedCharacters](segments, argumentError, firstSegment) {
+    static _checkWindowsPathReservedCharacters(segments, argumentError, firstSegment) {
       if (firstSegment === void 0)
         firstSegment = 0;
       segments[$skip](firstSegment)[$forEach](segment => {
         if (dart.dsend(segment, 'contains', new RegExp('["*/:<>?\\\\|]'))) {
           if (argumentError) {
             throw new ArgumentError("Illegal character in path");
           } else {
             throw new UnsupportedError("Illegal character in path");
           }
         }
       });
     }
-    static [_checkWindowsDriveLetter](charCode, argumentError) {
-      if (dart.notNull(Uri[_UPPER_CASE_A]) <= dart.notNull(charCode) && dart.notNull(charCode) <= dart.notNull(Uri[_UPPER_CASE_Z]) || dart.notNull(Uri[_LOWER_CASE_A]) <= dart.notNull(charCode) && dart.notNull(charCode) <= dart.notNull(Uri[_LOWER_CASE_Z])) {
+    static _checkWindowsDriveLetter(charCode, argumentError) {
+      if (dart.notNull(Uri._UPPER_CASE_A) <= dart.notNull(charCode) && dart.notNull(charCode) <= dart.notNull(Uri._UPPER_CASE_Z) || dart.notNull(Uri._LOWER_CASE_A) <= dart.notNull(charCode) && dart.notNull(charCode) <= dart.notNull(Uri._LOWER_CASE_Z)) {
         return;
       }
       if (argumentError) {
         throw new ArgumentError("Illegal drive letter " + dart.notNull(new String.fromCharCode(charCode)));
       } else {
         throw new UnsupportedError("Illegal drive letter " + dart.notNull(new String.fromCharCode(charCode)));
       }
     }
-    static [_makeFileUri](path) {
+    static _makeFileUri(path) {
       let sep = "/";
       if (path.startsWith(sep)) {
         return new Uri({scheme: "file", pathSegments: path.split(sep)});
       } else {
         return new Uri({pathSegments: path.split(sep)});
       }
     }
-    static [_makeWindowsFileUrl](path) {
+    static _makeWindowsFileUrl(path) {
       if (path.startsWith("\\\\?\\")) {
         if (path.startsWith("\\\\?\\UNC\\")) {
           path = `\\${path.substring(7)}`;
         } else {
           path = path.substring(4);
-          if (dart.notNull(path.length) < 3 || path.codeUnitAt(1) != Uri[_COLON] || path.codeUnitAt(2) != Uri[_BACKSLASH]) {
+          if (dart.notNull(path.length) < 3 || path.codeUnitAt(1) != Uri._COLON || path.codeUnitAt(2) != Uri._BACKSLASH) {
             throw new ArgumentError("Windows paths with \\\\?\\ prefix must be absolute");
           }
         }
       } else {
         path = path.replaceAll("/", "\\");
       }
       let sep = "\\";
       if (dart.notNull(path.length) > 1 && String.get(path, 1) == ":") {
-        Uri[_checkWindowsDriveLetter](path.codeUnitAt(0), true);
-        if (path.length == 2 || path.codeUnitAt(2) != Uri[_BACKSLASH]) {
+        Uri._checkWindowsDriveLetter(path.codeUnitAt(0), true);
+        if (path.length == 2 || path.codeUnitAt(2) != Uri._BACKSLASH) {
           throw new ArgumentError("Windows paths with drive letter must be absolute");
         }
         let pathSegments = path.split(sep);
-        Uri[_checkWindowsPathReservedCharacters](pathSegments, true, 1);
+        Uri._checkWindowsPathReservedCharacters(pathSegments, true, 1);
         return new Uri({scheme: "file", pathSegments: pathSegments});
       }
       if (dart.notNull(path.length) > 0 && String.get(path, 0) == sep) {
         if (dart.notNull(path.length) > 1 && String.get(path, 1) == sep) {
           let pathStart = path.indexOf("\\", 2);
           let hostPart = pathStart == -1 ? path.substring(2) : path.substring(2, pathStart);
           let pathPart = pathStart == -1 ? "" : path.substring(dart.notNull(pathStart) + 1);
           let pathSegments = pathPart.split(sep);
-          Uri[_checkWindowsPathReservedCharacters](pathSegments, true);
+          Uri._checkWindowsPathReservedCharacters(pathSegments, true);
           return new Uri({scheme: "file", host: hostPart, pathSegments: pathSegments});
         } else {
           let pathSegments = path.split(sep);
-          Uri[_checkWindowsPathReservedCharacters](pathSegments, true);
+          Uri._checkWindowsPathReservedCharacters(pathSegments, true);
           return new Uri({scheme: "file", pathSegments: pathSegments});
         }
       } else {
         let pathSegments = path.split(sep);
-        Uri[_checkWindowsPathReservedCharacters](pathSegments, true);
+        Uri._checkWindowsPathReservedCharacters(pathSegments, true);
         return new Uri({pathSegments: pathSegments});
       }
     }
     replace(opts) {
       let scheme = opts && 'scheme' in opts ? opts.scheme : null;
       let userInfo = opts && 'userInfo' in opts ? opts.userInfo : null;
       let host = opts && 'host' in opts ? opts.host : null;
       let port = opts && 'port' in opts ? opts.port : null;
       let path = opts && 'path' in opts ? opts.path : null;
       let pathSegments = opts && 'pathSegments' in opts ? opts.pathSegments : null;
       let query = opts && 'query' in opts ? opts.query : null;
       let queryParameters = opts && 'queryParameters' in opts ? opts.queryParameters : null;
       let fragment = opts && 'fragment' in opts ? opts.fragment : null;
       let schemeChanged = false;
       if (scheme != null) {
-        scheme = Uri[_makeScheme](scheme, scheme.length);
+        scheme = Uri._makeScheme(scheme, scheme.length);
         schemeChanged = true;
       } else {
         scheme = this.scheme;
       }
       let isFile = scheme == "file";
       if (userInfo != null) {
-        userInfo = Uri[_makeUserInfo](userInfo, 0, userInfo.length);
+        userInfo = Uri._makeUserInfo(userInfo, 0, userInfo.length);
       } else {
         userInfo = this.userInfo;
       }
       if (port != null) {
-        port = Uri[_makePort](port, scheme);
+        port = Uri._makePort(port, scheme);
       } else {
         port = this[_port];
         if (schemeChanged) {
-          port = Uri[_makePort](port, scheme);
+          port = Uri._makePort(port, scheme);
         }
       }
       if (host != null) {
-        host = Uri[_makeHost](host, 0, host.length, false);
+        host = Uri._makeHost(host, 0, host.length, false);
       } else if (this.hasAuthority) {
         host = this.host;
       } else if (dart.notNull(userInfo.isNotEmpty) || port != null || dart.notNull(isFile)) {
         host = "";
       }
       let ensureLeadingSlash = host != null;
       if (path != null || dart.notNull(pathSegments != null)) {
-        path = Uri[_makePath](path, 0, Uri[_stringOrNullLength](path), pathSegments, ensureLeadingSlash, isFile);
+        path = Uri._makePath(path, 0, Uri._stringOrNullLength(path), pathSegments, ensureLeadingSlash, isFile);
       } else {
         path = this.path;
         if ((dart.notNull(isFile) || dart.notNull(ensureLeadingSlash) && !dart.notNull(path.isEmpty)) && !dart.notNull(path.startsWith('/'))) {
           path = `/${path}`;
         }
       }
       if (query != null || dart.notNull(queryParameters != null)) {
-        query = Uri[_makeQuery](query, 0, Uri[_stringOrNullLength](query), queryParameters);
+        query = Uri._makeQuery(query, 0, Uri._stringOrNullLength(query), queryParameters);
       } else if (this.hasQuery) {
         query = this.query;
       }
       if (fragment != null) {
-        fragment = Uri[_makeFragment](fragment, 0, fragment.length);
+        fragment = Uri._makeFragment(fragment, 0, fragment.length);
       } else if (this.hasFragment) {
         fragment = this.fragment;
       }
       return new Uri[_internal$](scheme, userInfo, host, port, path, query, fragment);
     }
     get pathSegments() {
       if (this[_pathSegments] == null) {
-        let pathToSplit = !dart.notNull(this.path.isEmpty) && this.path.codeUnitAt(0) == Uri[_SLASH] ? this.path.substring(1) : this.path;
+        let pathToSplit = !dart.notNull(this.path.isEmpty) && this.path.codeUnitAt(0) == Uri._SLASH ? this.path.substring(1) : this.path;
         this[_pathSegments] = new collection.UnmodifiableListView(pathToSplit == "" ? dart.const(dart.setType([], List$(String))) : pathToSplit.split("/")[$map](dart.bind(Uri, 'decodeComponent'))[$toList]({growable: false}));
       }
       return this[_pathSegments];
     }
     get queryParameters() {
       if (this[_queryParameters] == null) {
         this[_queryParameters] = new (collection.UnmodifiableMapView$(String, String))(Uri.splitQueryString(this.query));
       }
       return this[_queryParameters];
     }
-    static [_makePort](port, scheme) {
-      if (port != null && port == Uri[_defaultPort](scheme))
+    static _makePort(port, scheme) {
+      if (port != null && port == Uri._defaultPort(scheme))
         return null;
       return port;
     }
-    static [_makeHost](host, start, end, strictIPv6) {
+    static _makeHost(host, start, end, strictIPv6) {
       if (host == null)
         return null;
       if (start == end)
         return "";
-      if (host.codeUnitAt(start) == Uri[_LEFT_BRACKET]) {
-        if (host.codeUnitAt(dart.notNull(end) - 1) != Uri[_RIGHT_BRACKET]) {
-          Uri[_fail](host, start, 'Missing end `]` to match `[` in host');
+      if (host.codeUnitAt(start) == Uri._LEFT_BRACKET) {
+        if (host.codeUnitAt(dart.notNull(end) - 1) != Uri._RIGHT_BRACKET) {
+          Uri._fail(host, start, 'Missing end `]` to match `[` in host');
         }
         Uri.parseIPv6Address(host, dart.notNull(start) + 1, dart.notNull(end) - 1);
         return host.substring(start, end).toLowerCase();
       }
       if (!dart.notNull(strictIPv6)) {
         for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
-          if (host.codeUnitAt(i) == Uri[_COLON]) {
+          if (host.codeUnitAt(i) == Uri._COLON) {
             Uri.parseIPv6Address(host, start, end);
             return `[${host}]`;
           }
         }
       }
-      return Uri[_normalizeRegName](host, start, end);
+      return Uri._normalizeRegName(host, start, end);
     }
-    static [_isRegNameChar](char) {
-      return dart.notNull(char) < 127 && dart.notNull(!dart.equals(dart.dsend(Uri[_regNameTable][$get](dart.notNull(char) >> 4), '&', 1 << (dart.notNull(char) & 15)), 0));
+    static _isRegNameChar(char) {
+      return dart.notNull(char) < 127 && dart.notNull(!dart.equals(dart.dsend(Uri._regNameTable[$get](dart.notNull(char) >> 4), '&', 1 << (dart.notNull(char) & 15)), 0));
     }
-    static [_normalizeRegName](host, start, end) {
+    static _normalizeRegName(host, start, end) {
       let buffer = null;
       let sectionStart = start;
       let index = start;
       let isNormalized = true;
       while (dart.notNull(index) < dart.notNull(end)) {
         let char = host.codeUnitAt(index);
-        if (char == Uri[_PERCENT]) {
-          let replacement = Uri[_normalizeEscape](host, index, true);
+        if (char == Uri._PERCENT) {
+          let replacement = Uri._normalizeEscape(host, index, true);
           if (replacement == null && dart.notNull(isNormalized)) {
             index = dart.notNull(index) + 3;
             continue;
           }
           if (buffer == null)
             buffer = new StringBuffer();
           let slice = host.substring(sectionStart, index);
           if (!dart.notNull(isNormalized))
             slice = slice.toLowerCase();
           buffer.write(slice);
           let sourceLength = 3;
           if (replacement == null) {
             replacement = host.substring(index, dart.notNull(index) + 3);
           } else if (replacement == "%") {
             replacement = "%25";
             sourceLength = 1;
           }
           buffer.write(replacement);
           index = dart.notNull(index) + dart.notNull(sourceLength);
           sectionStart = index;
           isNormalized = true;
-        } else if (Uri[_isRegNameChar](char)) {
-          if (dart.notNull(isNormalized) && dart.notNull(Uri[_UPPER_CASE_A]) <= dart.notNull(char) && dart.notNull(Uri[_UPPER_CASE_Z]) >= dart.notNull(char)) {
+        } else if (Uri._isRegNameChar(char)) {
+          if (dart.notNull(isNormalized) && dart.notNull(Uri._UPPER_CASE_A) <= dart.notNull(char) && dart.notNull(Uri._UPPER_CASE_Z) >= dart.notNull(char)) {
             if (buffer == null)
               buffer = new StringBuffer();
             if (dart.notNull(sectionStart) < dart.notNull(index)) {
               buffer.write(host.substring(sectionStart, index));
               sectionStart = index;
             }
             isNormalized = false;
           }
           index = dart.notNull(index) + 1;
-        } else if (Uri[_isGeneralDelimiter](char)) {
-          Uri[_fail](host, index, "Invalid character");
+        } else if (Uri._isGeneralDelimiter(char)) {
+          Uri._fail(host, index, "Invalid character");
         } else {
           let sourceLength = 1;
           if ((dart.notNull(char) & 64512) == 55296 && dart.notNull(index) + 1 < dart.notNull(end)) {
             let tail = host.codeUnitAt(dart.notNull(index) + 1);
             if ((dart.notNull(tail) & 64512) == 56320) {
               char = 65536 | (dart.notNull(char) & 1023) << 10 | dart.notNull(tail) & 1023;
               sourceLength = 2;
             }
           }
           if (buffer == null)
             buffer = new StringBuffer();
           let slice = host.substring(sectionStart, index);
           if (!dart.notNull(isNormalized))
             slice = slice.toLowerCase();
           buffer.write(slice);
-          buffer.write(Uri[_escapeChar](char));
+          buffer.write(Uri._escapeChar(char));
           index = dart.notNull(index) + dart.notNull(sourceLength);
           sectionStart = index;
         }
       }
       if (buffer == null)
         return host.substring(start, end);
       if (dart.notNull(sectionStart) < dart.notNull(end)) {
         let slice = host.substring(sectionStart, end);
         if (!dart.notNull(isNormalized))
           slice = slice.toLowerCase();
         buffer.write(slice);
       }
       return dart.toString(buffer);
     }
-    static [_makeScheme](scheme, end) {
+    static _makeScheme(scheme, end) {
       if (end == 0)
         return "";
       let firstCodeUnit = scheme.codeUnitAt(0);
-      if (!dart.notNull(Uri[_isAlphabeticCharacter](firstCodeUnit))) {
-        Uri[_fail](scheme, 0, "Scheme not starting with alphabetic character");
+      if (!dart.notNull(Uri._isAlphabeticCharacter(firstCodeUnit))) {
+        Uri._fail(scheme, 0, "Scheme not starting with alphabetic character");
       }
-      let allLowercase = dart.notNull(firstCodeUnit) >= dart.notNull(Uri[_LOWER_CASE_A]);
+      let allLowercase = dart.notNull(firstCodeUnit) >= dart.notNull(Uri._LOWER_CASE_A);
       for (let i = 0; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
         let codeUnit = scheme.codeUnitAt(i);
-        if (!dart.notNull(Uri[_isSchemeCharacter](codeUnit))) {
-          Uri[_fail](scheme, i, "Illegal scheme character");
+        if (!dart.notNull(Uri._isSchemeCharacter(codeUnit))) {
+          Uri._fail(scheme, i, "Illegal scheme character");
         }
-        if (dart.notNull(codeUnit) < dart.notNull(Uri[_LOWER_CASE_A]) || dart.notNull(codeUnit) > dart.notNull(Uri[_LOWER_CASE_Z])) {
+        if (dart.notNull(codeUnit) < dart.notNull(Uri._LOWER_CASE_A) || dart.notNull(codeUnit) > dart.notNull(Uri._LOWER_CASE_Z)) {
           allLowercase = false;
         }
       }
       scheme = scheme.substring(0, end);
       if (!dart.notNull(allLowercase))
         scheme = scheme.toLowerCase();
       return scheme;
     }
-    static [_makeUserInfo](userInfo, start, end) {
+    static _makeUserInfo(userInfo, start, end) {
       if (userInfo == null)
         return "";
-      return Uri[_normalize](userInfo, start, end, dart.as(Uri[_userinfoTable], List$(int)));
+      return Uri._normalize(userInfo, start, end, dart.as(Uri._userinfoTable, List$(int)));
     }
-    static [_makePath](path, start, end, pathSegments, ensureLeadingSlash, isFile) {
+    static _makePath(path, start, end, pathSegments, ensureLeadingSlash, isFile) {
       if (path == null && dart.notNull(pathSegments == null))
         return isFile ? "/" : "";
       if (path != null && dart.notNull(pathSegments != null)) {
         throw new ArgumentError('Both path and pathSegments specified');
       }
       let result = null;
       if (path != null) {
-        result = Uri[_normalize](path, start, end, dart.as(Uri[_pathCharOrSlashTable], List$(int)));
+        result = Uri._normalize(path, start, end, dart.as(Uri._pathCharOrSlashTable, List$(int)));
       } else {
-        result = pathSegments[$map](s => Uri[_uriEncode](dart.as(Uri[_pathCharTable], List$(int)), dart.as(s, String)))[$join]("/");
+        result = pathSegments[$map](s => Uri._uriEncode(dart.as(Uri._pathCharTable, List$(int)), dart.as(s, String)))[$join]("/");
       }
       if (dart.dload(result, 'isEmpty')) {
         if (isFile)
           return "/";
-      } else if ((dart.notNull(isFile) || dart.notNull(ensureLeadingSlash)) && dart.notNull(!dart.equals(dart.dsend(result, 'codeUnitAt', 0), Uri[_SLASH]))) {
+      } else if ((dart.notNull(isFile) || dart.notNull(ensureLeadingSlash)) && dart.notNull(!dart.equals(dart.dsend(result, 'codeUnitAt', 0), Uri._SLASH))) {
         return `/${result}`;
       }
       return dart.as(result, String);
     }
-    static [_makeQuery](query, start, end, queryParameters) {
+    static _makeQuery(query, start, end, queryParameters) {
       if (query == null && dart.notNull(queryParameters == null))
         return null;
       if (query != null && dart.notNull(queryParameters != null)) {
         throw new ArgumentError('Both query and queryParameters specified');
       }
       if (query != null)
-        return Uri[_normalize](query, start, end, dart.as(Uri[_queryCharTable], List$(int)));
+        return Uri._normalize(query, start, end, dart.as(Uri._queryCharTable, List$(int)));
       let result = new StringBuffer();
       let first = true;
       queryParameters.forEach((key, value) => {
         if (!dart.notNull(first)) {
           result.write("&");
         }
         first = false;
         result.write(Uri.encodeQueryComponent(dart.as(key, String)));
         if (dart.notNull(value != null) && dart.notNull(dart.dsend(dart.dload(value, 'isEmpty'), '!'))) {
           result.write("=");
           result.write(Uri.encodeQueryComponent(dart.as(value, String)));
         }
       });
       return dart.toString(result);
     }
-    static [_makeFragment](fragment, start, end) {
+    static _makeFragment(fragment, start, end) {
       if (fragment == null)
         return null;
-      return Uri[_normalize](fragment, start, end, dart.as(Uri[_queryCharTable], List$(int)));
+      return Uri._normalize(fragment, start, end, dart.as(Uri._queryCharTable, List$(int)));
     }
-    static [_stringOrNullLength](s) {
+    static _stringOrNullLength(s) {
       return s == null ? 0 : s.length;
     }
-    static [_isHexDigit](char) {
-      if (dart.notNull(Uri[_NINE]) >= dart.notNull(char))
-        return dart.notNull(Uri[_ZERO]) <= dart.notNull(char);
+    static _isHexDigit(char) {
+      if (dart.notNull(Uri._NINE) >= dart.notNull(char))
+        return dart.notNull(Uri._ZERO) <= dart.notNull(char);
       char = dart.notNull(char) | 32;
-      return dart.notNull(Uri[_LOWER_CASE_A]) <= dart.notNull(char) && dart.notNull(Uri[_LOWER_CASE_F]) >= dart.notNull(char);
+      return dart.notNull(Uri._LOWER_CASE_A) <= dart.notNull(char) && dart.notNull(Uri._LOWER_CASE_F) >= dart.notNull(char);
     }
-    static [_hexValue](char) {
-      dart.assert(Uri[_isHexDigit](char));
-      if (dart.notNull(Uri[_NINE]) >= dart.notNull(char))
-        return dart.notNull(char) - dart.notNull(Uri[_ZERO]);
+    static _hexValue(char) {
+      dart.assert(Uri._isHexDigit(char));
+      if (dart.notNull(Uri._NINE) >= dart.notNull(char))
+        return dart.notNull(char) - dart.notNull(Uri._ZERO);
       char = dart.notNull(char) | 32;
-      return dart.notNull(char) - (dart.notNull(Uri[_LOWER_CASE_A]) - 10);
+      return dart.notNull(char) - (dart.notNull(Uri._LOWER_CASE_A) - 10);
     }
-    static [_normalizeEscape](source, index, lowerCase) {
-      dart.assert(source.codeUnitAt(index) == Uri[_PERCENT]);
+    static _normalizeEscape(source, index, lowerCase) {
+      dart.assert(source.codeUnitAt(index) == Uri._PERCENT);
       if (dart.notNull(index) + 2 >= dart.notNull(source.length)) {
         return "%";
       }
       let firstDigit = source.codeUnitAt(dart.notNull(index) + 1);
       let secondDigit = source.codeUnitAt(dart.notNull(index) + 2);
-      if (!dart.notNull(Uri[_isHexDigit](firstDigit)) || !dart.notNull(Uri[_isHexDigit](secondDigit))) {
+      if (!dart.notNull(Uri._isHexDigit(firstDigit)) || !dart.notNull(Uri._isHexDigit(secondDigit))) {
         return "%";
       }
-      let value = dart.notNull(Uri[_hexValue](firstDigit)) * 16 + dart.notNull(Uri[_hexValue](secondDigit));
-      if (Uri[_isUnreservedChar](value)) {
-        if (dart.notNull(lowerCase) && dart.notNull(Uri[_UPPER_CASE_A]) <= dart.notNull(value) && dart.notNull(Uri[_UPPER_CASE_Z]) >= dart.notNull(value)) {
+      let value = dart.notNull(Uri._hexValue(firstDigit)) * 16 + dart.notNull(Uri._hexValue(secondDigit));
+      if (Uri._isUnreservedChar(value)) {
+        if (dart.notNull(lowerCase) && dart.notNull(Uri._UPPER_CASE_A) <= dart.notNull(value) && dart.notNull(Uri._UPPER_CASE_Z) >= dart.notNull(value)) {
           value = dart.notNull(value) | 32;
         }
         return new String.fromCharCode(value);
       }
-      if (dart.notNull(firstDigit) >= dart.notNull(Uri[_LOWER_CASE_A]) || dart.notNull(secondDigit) >= dart.notNull(Uri[_LOWER_CASE_A])) {
+      if (dart.notNull(firstDigit) >= dart.notNull(Uri._LOWER_CASE_A) || dart.notNull(secondDigit) >= dart.notNull(Uri._LOWER_CASE_A)) {
         return source.substring(index, dart.notNull(index) + 3).toUpperCase();
       }
       return null;
     }
-    static [_isUnreservedChar](ch) {
-      return dart.notNull(ch) < 127 && dart.notNull(!dart.equals(dart.dsend(Uri[_unreservedTable][$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
+    static _isUnreservedChar(ch) {
+      return dart.notNull(ch) < 127 && dart.notNull(!dart.equals(dart.dsend(Uri._unreservedTable[$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
     }
-    static [_escapeChar](char) {
+    static _escapeChar(char) {
       dart.assert(dart.dsend(char, '<=', 1114111));
       let hexDigits = "0123456789ABCDEF";
       let codeUnits = null;
       if (dart.dsend(char, '<', 128)) {
         codeUnits = new List(3);
-        codeUnits[$set](0, Uri[_PERCENT]);
+        codeUnits[$set](0, Uri._PERCENT);
         codeUnits[$set](1, hexDigits.codeUnitAt(dart.as(dart.dsend(char, '>>', 4), int)));
         codeUnits[$set](2, hexDigits.codeUnitAt(dart.as(dart.dsend(char, '&', 15), int)));
       } else {
         let flag = 192;
         let encodedBytes = 2;
         if (dart.dsend(char, '>', 2047)) {
           flag = 224;
           encodedBytes = 3;
           if (dart.dsend(char, '>', 65535)) {
             encodedBytes = 4;
             flag = 240;
           }
         }
         codeUnits = new List(3 * dart.notNull(encodedBytes));
         let index = 0;
         while ((encodedBytes = dart.notNull(encodedBytes) - 1) >= 0) {
           let byte = dart.as(dart.dsend(dart.dsend(dart.dsend(char, '>>', 6 * dart.notNull(encodedBytes)), '&', 63), '|', flag), int);
-          codeUnits[$set](index, Uri[_PERCENT]);
+          codeUnits[$set](index, Uri._PERCENT);
           codeUnits[$set](dart.notNull(index) + 1, hexDigits.codeUnitAt(dart.notNull(byte) >> 4));
           codeUnits[$set](dart.notNull(index) + 2, hexDigits.codeUnitAt(dart.notNull(byte) & 15));
           index = dart.notNull(index) + 3;
           flag = 128;
         }
       }
       return new String.fromCharCodes(dart.as(codeUnits, Iterable$(int)));
     }
-    static [_normalize](component, start, end, charTable) {
+    static _normalize(component, start, end, charTable) {
       let buffer = null;
       let sectionStart = start;
       let index = start;
       while (dart.notNull(index) < dart.notNull(end)) {
         let char = component.codeUnitAt(index);
         if (dart.notNull(char) < 127 && (dart.notNull(charTable[$get](dart.notNull(char) >> 4)) & 1 << (dart.notNull(char) & 15)) != 0) {
           index = dart.notNull(index) + 1;
         } else {
           let replacement = null;
           let sourceLength = null;
-          if (char == Uri[_PERCENT]) {
-            replacement = Uri[_normalizeEscape](component, index, false);
+          if (char == Uri._PERCENT) {
+            replacement = Uri._normalizeEscape(component, index, false);
             if (replacement == null) {
               index = dart.notNull(index) + 3;
               continue;
             }
             if ("%" == replacement) {
               replacement = "%25";
               sourceLength = 1;
             } else {
               sourceLength = 3;
             }
-          } else if (Uri[_isGeneralDelimiter](char)) {
-            Uri[_fail](component, index, "Invalid character");
+          } else if (Uri._isGeneralDelimiter(char)) {
+            Uri._fail(component, index, "Invalid character");
           } else {
             sourceLength = 1;
             if ((dart.notNull(char) & 64512) == 55296) {
               if (dart.notNull(index) + 1 < dart.notNull(end)) {
                 let tail = component.codeUnitAt(dart.notNull(index) + 1);
                 if ((dart.notNull(tail) & 64512) == 56320) {
                   sourceLength = 2;
                   char = 65536 | (dart.notNull(char) & 1023) << 10 | dart.notNull(tail) & 1023;
                 }
               }
             }
-            replacement = Uri[_escapeChar](char);
+            replacement = Uri._escapeChar(char);
           }
           if (buffer == null)
             buffer = new StringBuffer();
           buffer.write(component.substring(sectionStart, index));
           buffer.write(replacement);
           index = dart.notNull(index) + dart.notNull(sourceLength);
           sectionStart = index;
         }
       }
       if (buffer == null) {
         return component.substring(start, end);
       }
       if (dart.notNull(sectionStart) < dart.notNull(end)) {
         buffer.write(component.substring(sectionStart, end));
       }
       return dart.toString(buffer);
     }
-    static [_isSchemeCharacter](ch) {
-      return dart.notNull(ch) < 128 && dart.notNull(!dart.equals(dart.dsend(Uri[_schemeTable][$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
+    static _isSchemeCharacter(ch) {
+      return dart.notNull(ch) < 128 && dart.notNull(!dart.equals(dart.dsend(Uri._schemeTable[$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
     }
-    static [_isGeneralDelimiter](ch) {
-      return dart.notNull(ch) <= dart.notNull(Uri[_RIGHT_BRACKET]) && dart.notNull(!dart.equals(dart.dsend(Uri[_genDelimitersTable][$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
+    static _isGeneralDelimiter(ch) {
+      return dart.notNull(ch) <= dart.notNull(Uri._RIGHT_BRACKET) && dart.notNull(!dart.equals(dart.dsend(Uri._genDelimitersTable[$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
     }
     get isAbsolute() {
       return this.scheme != "" && this.fragment == "";
     }
     [_merge](base, reference) {
       if (base.isEmpty)
         return `/${reference}`;
       let backCount = 0;
       let refStart = 0;
       while (reference.startsWith("../", refStart)) {
         refStart = dart.notNull(refStart) + 3;
         backCount = dart.notNull(backCount) + 1;
       }
       let baseEnd = base.lastIndexOf('/');
       while (dart.notNull(baseEnd) > 0 && dart.notNull(backCount) > 0) {
         let newEnd = base.lastIndexOf('/', dart.notNull(baseEnd) - 1);
         if (dart.notNull(newEnd) < 0) {
           break;
         }
         let delta = dart.notNull(baseEnd) - dart.notNull(newEnd);
-        if ((delta == 2 || delta == 3) && base.codeUnitAt(dart.notNull(newEnd) + 1) == Uri[_DOT] && (delta == 2 || base.codeUnitAt(dart.notNull(newEnd) + 2) == Uri[_DOT])) {
+        if ((delta == 2 || delta == 3) && base.codeUnitAt(dart.notNull(newEnd) + 1) == Uri._DOT && (delta == 2 || base.codeUnitAt(dart.notNull(newEnd) + 2) == Uri._DOT)) {
           break;
         }
         baseEnd = newEnd;
         backCount = dart.notNull(backCount) - 1;
       }
       return dart.notNull(base.substring(0, dart.notNull(baseEnd) + 1)) + dart.notNull(reference.substring(dart.notNull(refStart) - 3 * dart.notNull(backCount)));
     }
     [_hasDotSegments](path) {
-      if (dart.notNull(path.length) > 0 && path.codeUnitAt(0) == Uri[_DOT])
+      if (dart.notNull(path.length) > 0 && path.codeUnitAt(0) == Uri._DOT)
         return true;
       let index = path.indexOf("/.");
       return index != -1;
     }
     [_removeDotSegments](path) {
       if (!dart.notNull(this[_hasDotSegments](path)))
         return path;
       let output = dart.setType([], List$(String));
       let appendSlash = false;
       for (let segment of path.split("/")) {
@@ skipping 31 matching lines @@
         }
         targetPath = this[_removeDotSegments](reference.path);
         if (reference.hasQuery) {
           targetQuery = reference.query;
         }
       } else {
         targetScheme = this.scheme;
         if (reference.hasAuthority) {
           targetUserInfo = reference.userInfo;
           targetHost = reference.host;
-          targetPort = Uri[_makePort](reference.hasPort ? reference.port : null, targetScheme);
+          targetPort = Uri._makePort(reference.hasPort ? reference.port : null, targetScheme);
           targetPath = this[_removeDotSegments](reference.path);
           if (reference.hasQuery)
             targetQuery = reference.query;
         } else {
           if (reference.path == "") {
             targetPath = this[_path];
             if (reference.hasQuery) {
               targetQuery = reference.query;
             } else {
               targetQuery = this[_query];
@@ skipping 43 matching lines @@
       if (this.scheme != "" && this.scheme != "file") {
         throw new UnsupportedError(`Cannot extract a file path from a ${this.scheme} URI`);
       }
       if (this.query != "") {
         throw new UnsupportedError("Cannot extract a file path from a URI with a query component");
       }
       if (this.fragment != "") {
         throw new UnsupportedError("Cannot extract a file path from a URI with a fragment component");
       }
       if (windows == null)
-        windows = Uri[_isWindows];
+        windows = Uri._isWindows;
       return windows ? this[_toWindowsFilePath]() : this[_toFilePath]();
     }
     [_toFilePath]() {
       if (this.host != "") {
         throw new UnsupportedError("Cannot extract a non-Windows file path from a file URI " + "with an authority");
       }
-      Uri[_checkNonWindowsPathReservedCharacters](this.pathSegments, false);
+      Uri._checkNonWindowsPathReservedCharacters(this.pathSegments, false);
       let result = new StringBuffer();
       if (this[_isPathAbsolute])
         result.write("/");
       result.writeAll(this.pathSegments, "/");
       return dart.toString(result);
     }
     [_toWindowsFilePath]() {
       let hasDriveLetter = false;
       let segments = this.pathSegments;
-      if (dart.notNull(segments[$length]) > 0 && segments[$get](0).length == 2 && segments[$get](0).codeUnitAt(1) == Uri[_COLON]) {
-        Uri[_checkWindowsDriveLetter](segments[$get](0).codeUnitAt(0), false);
-        Uri[_checkWindowsPathReservedCharacters](segments, false, 1);
+      if (dart.notNull(segments[$length]) > 0 && segments[$get](0).length == 2 && segments[$get](0).codeUnitAt(1) == Uri._COLON) {
+        Uri._checkWindowsDriveLetter(segments[$get](0).codeUnitAt(0), false);
+        Uri._checkWindowsPathReservedCharacters(segments, false, 1);
         hasDriveLetter = true;
       } else {
-        Uri[_checkWindowsPathReservedCharacters](segments, false);
+        Uri._checkWindowsPathReservedCharacters(segments, false);
       }
       let result = new StringBuffer();
       if (dart.notNull(this[_isPathAbsolute]) && !dart.notNull(hasDriveLetter))
         result.write("\\");
       if (this.host != "") {
         result.write("\\");
         result.write(this.host);
         result.write("\\");
       }
       result.writeAll(segments, "\\");
@@ skipping 13 matching lines @@
       }
       if (this[_host] != null)
         ss.write(this[_host]);
       if (this[_port] != null) {
         ss.write(":");
         ss.write(this[_port]);
       }
     }
     toString() {
       let sb = new StringBuffer();
-      Uri[_addIfNonEmpty](sb, this.scheme, this.scheme, ':');
+      Uri._addIfNonEmpty(sb, this.scheme, this.scheme, ':');
       if (dart.notNull(this.hasAuthority) || dart.notNull(this.path.startsWith("//")) || this.scheme == "file") {
         sb.write("//");
         this[_writeAuthority](sb);
       }
       sb.write(this.path);
       if (this[_query] != null) {
         sb.write("?");
         sb.write(this[_query]);
       }
       if (this[_fragment] != null) {
         sb.write("#");
         sb.write(this[_fragment]);
       }
       return dart.toString(sb);
     }
     ['=='](other) {
       if (!dart.is(other, Uri))
         return false;
       let uri = dart.as(other, Uri);
       return this.scheme == uri.scheme && this.hasAuthority == uri.hasAuthority && this.userInfo == uri.userInfo && this.host == uri.host && this.port == uri.port && this.path == uri.path && this.hasQuery == uri.hasQuery && this.query == uri.query && this.hasFragment == uri.hasFragment && this.fragment == uri.fragment;
     }
     get hashCode() {
       // Function combine: (dynamic, dynamic) → int
       function combine(part, current) {
         return dart.as(dart.dsend(dart.dsend(dart.dsend(current, '*', 31), '+', dart.hashCode(part)), '&', 1073741823), int);
       }
       return combine(this.scheme, combine(this.userInfo, combine(this.host, combine(this.port, combine(this.path, combine(this.query, combine(this.fragment, 1)))))));
     }
-    static [_addIfNonEmpty](sb, test, first, second) {
+    static _addIfNonEmpty(sb, test, first, second) {
       if ("" != test) {
         sb.write(first);
         sb.write(second);
       }
     }
     static encodeComponent(component) {
-      return Uri[_uriEncode](dart.as(Uri[_unreserved2396Table], List$(int)), component);
+      return Uri._uriEncode(dart.as(Uri._unreserved2396Table, List$(int)), component);
     }
     static encodeQueryComponent(component, opts) {
       let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
-      return Uri[_uriEncode](dart.as(Uri[_unreservedTable], List$(int)), component, {encoding: encoding, spaceToPlus: true});
+      return Uri._uriEncode(dart.as(Uri._unreservedTable, List$(int)), component, {encoding: encoding, spaceToPlus: true});
     }
     static decodeComponent(encodedComponent) {
-      return Uri[_uriDecode](encodedComponent);
+      return Uri._uriDecode(encodedComponent);
     }
     static decodeQueryComponent(encodedComponent, opts) {
       let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
-      return Uri[_uriDecode](encodedComponent, {plusToSpace: true, encoding: encoding});
+      return Uri._uriDecode(encodedComponent, {plusToSpace: true, encoding: encoding});
     }
     static encodeFull(uri) {
-      return Uri[_uriEncode](dart.as(Uri[_encodeFullTable], List$(int)), uri);
+      return Uri._uriEncode(dart.as(Uri._encodeFullTable, List$(int)), uri);
     }
     static decodeFull(uri) {
-      return Uri[_uriDecode](uri);
+      return Uri._uriDecode(uri);
     }
     static splitQueryString(query, opts) {
       let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
       return dart.as(query.split("&")[$fold](dart.map(), (map, element) => {
         let index = dart.as(dart.dsend(element, 'indexOf', "="), int);
         if (index == -1) {
           if (!dart.equals(element, "")) {
             dart.dsetindex(map, Uri.decodeQueryComponent(dart.as(element, String), {encoding: encoding}), "");
           }
         } else if (index != 0) {
@@ skipping 44 matching lines @@
           error('each part must be in the range of `0x0..0xFFFF`', start);
         }
         return value;
       }
       if (dart.notNull(host.length) < 2)
         error('address is too short');
       let parts = dart.setType([], List$(int));
       let wildcardSeen = false;
       let partStart = start;
       for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
-        if (host.codeUnitAt(i) == Uri[_COLON]) {
+        if (host.codeUnitAt(i) == Uri._COLON) {
           if (i == start) {
             i = dart.notNull(i) + 1;
-            if (host.codeUnitAt(i) != Uri[_COLON]) {
+            if (host.codeUnitAt(i) != Uri._COLON) {
               error('invalid start colon.', i);
             }
             partStart = i;
           }
           if (i == partStart) {
             if (wildcardSeen) {
               error('only one wildcard `::` is allowed', i);
             }
             wildcardSeen = true;
             parts[$add](-1);
@@ skipping 43 matching lines @@
             index = dart.notNull(index) + 2;
           }
         } else {
           bytes[$set](index, dart.notNull(value) >> 8);
           bytes[$set](dart.notNull(index) + 1, dart.notNull(value) & 255);
           index = dart.notNull(index) + 2;
         }
       }
       return dart.as(bytes, List$(int));
     }
-    static [_uriEncode](canonicalTable, text, opts) {
+    static _uriEncode(canonicalTable, text, opts) {
       let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
       let spaceToPlus = opts && 'spaceToPlus' in opts ? opts.spaceToPlus : false;
       // Function byteToHex: (dynamic, dynamic) → dynamic
       function byteToHex(byte, buffer) {
         let hex = '0123456789ABCDEF';
         dart.dsend(buffer, 'writeCharCode', hex.codeUnitAt(dart.as(dart.dsend(byte, '>>', 4), int)));
         dart.dsend(buffer, 'writeCharCode', hex.codeUnitAt(dart.as(dart.dsend(byte, '&', 15), int)));
       }
       let result = new StringBuffer();
       let bytes = encoding.encode(text);
       for (let i = 0; dart.notNull(i) < dart.notNull(bytes[$length]); i = dart.notNull(i) + 1) {
         let byte = bytes[$get](i);
         if (dart.notNull(byte) < 128 && (dart.notNull(canonicalTable[$get](dart.notNull(byte) >> 4)) & 1 << (dart.notNull(byte) & 15)) != 0) {
           result.writeCharCode(byte);
-        } else if (dart.notNull(spaceToPlus) && byte == Uri[_SPACE]) {
-          result.writeCharCode(Uri[_PLUS]);
+        } else if (dart.notNull(spaceToPlus) && byte == Uri._SPACE) {
+          result.writeCharCode(Uri._PLUS);
         } else {
-          result.writeCharCode(Uri[_PERCENT]);
+          result.writeCharCode(Uri._PERCENT);
           byteToHex(byte, result);
         }
       }
       return dart.toString(result);
     }
-    static [_hexCharPairToByte](s, pos) {
+    static _hexCharPairToByte(s, pos) {
       let byte = 0;
       for (let i = 0; dart.notNull(i) < 2; i = dart.notNull(i) + 1) {
         let charCode = s.codeUnitAt(dart.notNull(pos) + dart.notNull(i));
         if (48 <= dart.notNull(charCode) && dart.notNull(charCode) <= 57) {
           byte = dart.notNull(byte) * 16 + dart.notNull(charCode) - 48;
         } else {
           charCode = dart.notNull(charCode) | 32;
           if (97 <= dart.notNull(charCode) && dart.notNull(charCode) <= 102) {
             byte = dart.notNull(byte) * 16 + dart.notNull(charCode) - 87;
           } else {
             throw new ArgumentError("Invalid URL encoding");
           }
         }
       }
       return byte;
     }
-    static [_uriDecode](text, opts) {
+    static _uriDecode(text, opts) {
       let plusToSpace = opts && 'plusToSpace' in opts ? opts.plusToSpace : false;
       let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
       let simple = true;
       for (let i = 0; dart.notNull(i) < dart.notNull(text.length) && dart.notNull(simple); i = dart.notNull(i) + 1) {
         let codeUnit = text.codeUnitAt(i);
-        simple = codeUnit != Uri[_PERCENT] && codeUnit != Uri[_PLUS];
+        simple = codeUnit != Uri._PERCENT && codeUnit != Uri._PLUS;
       }
       let bytes = null;
       if (simple) {
         if (dart.notNull(dart.equals(encoding, convert.UTF8)) || dart.notNull(dart.equals(encoding, convert.LATIN1))) {
           return text;
         } else {
           bytes = text.codeUnits;
         }
       } else {
         bytes = new (List$(int))();
         for (let i = 0; dart.notNull(i) < dart.notNull(text.length); i = dart.notNull(i) + 1) {
           let codeUnit = text.codeUnitAt(i);
           if (dart.notNull(codeUnit) > 127) {
             throw new ArgumentError("Illegal percent encoding in URI");
           }
-          if (codeUnit == Uri[_PERCENT]) {
+          if (codeUnit == Uri._PERCENT) {
             if (dart.notNull(i) + 3 > dart.notNull(text.length)) {
               throw new ArgumentError('Truncated URI');
             }
-            bytes[$add](Uri[_hexCharPairToByte](text, dart.notNull(i) + 1));
+            bytes[$add](Uri._hexCharPairToByte(text, dart.notNull(i) + 1));
             i = dart.notNull(i) + 2;
-          } else if (dart.notNull(plusToSpace) && codeUnit == Uri[_PLUS]) {
-            bytes[$add](Uri[_SPACE]);
+          } else if (dart.notNull(plusToSpace) && codeUnit == Uri._PLUS) {
+            bytes[$add](Uri._SPACE);
           } else {
             bytes[$add](codeUnit);
           }
         }
       }
       return encoding.decode(bytes);
     }
-    static [_isAlphabeticCharacter](codeUnit) {
-      return dart.notNull(codeUnit) >= dart.notNull(Uri[_LOWER_CASE_A]) && dart.notNull(codeUnit) <= dart.notNull(Uri[_LOWER_CASE_Z]) || dart.notNull(codeUnit) >= dart.notNull(Uri[_UPPER_CASE_A]) && dart.notNull(codeUnit) <= dart.notNull(Uri[_UPPER_CASE_Z]);
+    static _isAlphabeticCharacter(codeUnit) {
+      return dart.notNull(codeUnit) >= dart.notNull(Uri._LOWER_CASE_A) && dart.notNull(codeUnit) <= dart.notNull(Uri._LOWER_CASE_Z) || dart.notNull(codeUnit) >= dart.notNull(Uri._UPPER_CASE_A) && dart.notNull(codeUnit) <= dart.notNull(Uri._UPPER_CASE_Z);
     }
   }
-  dart.defineNamedConstructor(Uri, _internal$);
+  dart.defineNamedConstructor(Uri, '_internal');
   dart.defineNamedConstructor(Uri, 'http');
   dart.defineNamedConstructor(Uri, 'https');
   dart.defineNamedConstructor(Uri, 'file');
   Uri._SPACE = 32;
   Uri._DOUBLE_QUOTE = 34;
   Uri._NUMBER_SIGN = 35;
   Uri._PERCENT = 37;
   Uri._ASTERISK = 42;
   Uri._PLUS = 43;
   Uri._DOT = 46;
@@ skipping 168 matching lines @@
   exports.StackTrace = StackTrace;
   exports.Stopwatch = Stopwatch;
   exports.String = String;
   exports.RuneIterator = RuneIterator;
   exports.StringBuffer = StringBuffer;
   exports.StringSink = StringSink;
   exports.Symbol = Symbol;
   exports.Type = Type;
   exports.Uri = Uri;
 })(core || (core = {}));