Load web tests using the plugin infrastructure.

lib/src/runner/browser/static/host.dart.js

-// Generated by dart2js, the Dart to JavaScript compiler version: 1.12.0-edge.61ea0618ce6e29cf101bc9c062222f04b97f211a.
+// Generated by dart2js, the Dart to JavaScript compiler version: 1.14.0-edge.f887b03b5b21735a292ef599d132568b661ce29b.
 // The code supports the following hooks:
 // dartPrint(message):
 //    if this function is defined it is called instead of the Dart [print]
 //    method.
 //
 // dartMainRunner(main, args):
 //    if this function is defined, the Dart [main] method will not be invoked
 //    directly. Instead, a closure that will invoke [main], and its arguments
 //    [args] is passed to [dartMainRunner].
 //
@@ skipping 543 matching lines @@
         if (true === proto)
           return object;
         objectProto = Object.getPrototypeOf(object);
         if (proto === objectProto)
           return record.i;
         if (record.e === objectProto)
           throw H.wrapException(new P.UnimplementedError("Return interceptor for " + H.S(proto(object, record))));
       }
       interceptor = H.lookupAndCacheInterceptor(object);
       if (interceptor == null) {
+        if (typeof object == "function")
+          return C.JavaScriptFunction_methods;
         proto = Object.getPrototypeOf(object);
         if (proto == null || proto === Object.prototype)
           return C.PlainJavaScriptObject_methods;
         else
           return C.UnknownJavaScriptObject_methods;
       }
       return interceptor;
     },
     Interceptor: {
       "^": "Object;",
       $eq: function(receiver, other) {
         return receiver === other;
       },
       get$hashCode: function(receiver) {
         return H.Primitives_objectHashCode(receiver);
       },
       toString$0: ["super$Interceptor$toString", function(receiver) {
         return H.Primitives_objectToHumanReadableString(receiver);
       }],
       noSuchMethod$1: ["super$Interceptor$noSuchMethod", function(receiver, invocation) {
         throw H.wrapException(P.NoSuchMethodError$(receiver, invocation.get$memberName(), invocation.get$positionalArguments(), invocation.get$namedArguments(), null));
-      }, null, "get$noSuchMethod", 2, 0, null, 16],
-      "%": "MediaError|MediaKeyError|SVGAnimatedLength|SVGAnimatedLengthList|SVGAnimatedNumber|SVGAnimatedNumberList|SVGAnimatedString"
+      }, null, "get$noSuchMethod", 2, 0, null, 24],
+      "%": "MediaError|MediaKeyError|SVGAnimatedLength|SVGAnimatedLengthList|SVGAnimatedNumber|SVGAnimatedNumberList|SVGAnimatedString|SVGAnimatedTransformList"
     },
     JSBool: {
       "^": "Interceptor;",
       toString$0: function(receiver) {
         return String(receiver);
       },
       get$hashCode: function(receiver) {
         return receiver ? 519018 : 218159;
       },
       $isbool: 1
     },
     JSNull: {
       "^": "Interceptor;",
       $eq: function(receiver, other) {
         return null == other;
       },
       toString$0: function(receiver) {
         return "null";
       },
       get$hashCode: function(receiver) {
         return 0;
       },
       noSuchMethod$1: [function(receiver, invocation) {
         return this.super$Interceptor$noSuchMethod(receiver, invocation);
-      }, null, "get$noSuchMethod", 2, 0, null, 16]
+      }, null, "get$noSuchMethod", 2, 0, null, 24]
     },
     JavaScriptObject: {
       "^": "Interceptor;",
-      get$hashCode: function(_) {
+      get$hashCode: function(receiver) {
         return 0;
       },
+      toString$0: ["super$JavaScriptObject$toString", function(receiver) {
+        return String(receiver);
+      }],
       $isJSObject: 1
     },
     PlainJavaScriptObject: {
       "^": "JavaScriptObject;"
     },
     UnknownJavaScriptObject: {
+      "^": "JavaScriptObject;"
+    },
+    JavaScriptFunction: {
       "^": "JavaScriptObject;",
       toString$0: function(receiver) {
-        return String(receiver);
-      }
+        var dartClosure = receiver[$.$get$DART_CLOSURE_PROPERTY_NAME()];
+        return dartClosure == null ? this.super$JavaScriptObject$toString(receiver) : J.toString$0$(dartClosure);
+      },
+      $isFunction: 1
     },
     JSArray: {
       "^": "Interceptor;",
       checkMutable$1: function(receiver, reason) {
         if (!!receiver.immutable$list)
           throw H.wrapException(new P.UnsupportedError(reason));
       },
       checkGrowable$1: function(receiver, reason) {
         if (!!receiver.fixed$length)
           throw H.wrapException(new P.UnsupportedError(reason));
@@ skipping 20 matching lines @@
         P.RangeError_checkValueInInterval(index, 0, receiver.length, "index", null);
         insertionLength = iterable.length;
         this.set$length(receiver, receiver.length + insertionLength);
         end = index + insertionLength;
         this.setRange$4(receiver, end, receiver.length, receiver, index);
         this.setRange$3(receiver, index, end, iterable);
       },
       removeLast$0: function(receiver) {
         this.checkGrowable$1(receiver, "removeLast");
         if (receiver.length === 0)
-          throw H.wrapException(P.RangeError$value(-1, null, null));
+          throw H.wrapException(H.diagnoseIndexError(receiver, -1));
         return receiver.pop();
       },
       addAll$1: function(receiver, collection) {
         var t1;
         this.checkGrowable$1(receiver, "addAll");
         for (t1 = J.get$iterator$ax(collection); t1.moveNext$0();)
           receiver.push(t1.get$current());
       },
+      clear$0: function(receiver) {
+        this.set$length(receiver, 0);
+      },
       forEach$1: function(receiver, f) {
         var end, i;
         end = receiver.length;
         for (i = 0; i < end; ++i) {
           f.call$1(receiver[i]);
           if (receiver.length !== end)
             throw H.wrapException(new P.ConcurrentModificationError(receiver));
         }
       },
       map$1: function(receiver, f) {
         return H.setRuntimeTypeInfo(new H.MappedListIterable(receiver, f), [null, null]);
       },
       join$1: function(receiver, separator) {
         var t1, list, i, t2;
         t1 = receiver.length;
-        list = Array(t1);
+        list = new Array(t1);
         list.fixed$length = Array;
         for (i = 0; i < receiver.length; ++i) {
           t2 = H.S(receiver[i]);
           if (i >= t1)
             return H.ioore(list, i);
           list[i] = t2;
         }
         return list.join(separator);
       },
       join$0: function($receiver) {
         return this.join$1($receiver, "");
       },
-      skip$1: function(receiver, n) {
-        return H.SubListIterable$(receiver, n, null, H.getTypeArgumentByIndex(receiver, 0));
-      },
       fold$2: function(receiver, initialValue, combine) {
         var $length, value, i;
         $length = receiver.length;
         for (value = initialValue, i = 0; i < $length; ++i) {
           value = combine.call$2(value, receiver[i]);
           if (receiver.length !== $length)
             throw H.wrapException(new P.ConcurrentModificationError(receiver));
         }
         return value;
       },
       elementAt$1: function(receiver, index) {
         if (index >>> 0 !== index || index >= receiver.length)
           return H.ioore(receiver, index);
         return receiver[index];
       },
       sublist$2: function(receiver, start, end) {
         if (start < 0 || start > receiver.length)
-          throw H.wrapException(P.RangeError$range(start, 0, receiver.length, null, null));
+          throw H.wrapException(P.RangeError$range(start, 0, receiver.length, "start", null));
         if (end == null)
           end = receiver.length;
         else {
           if (typeof end !== "number" || Math.floor(end) !== end)
             throw H.wrapException(H.argumentErrorValue(end));
           if (end < start || end > receiver.length)
-            throw H.wrapException(P.RangeError$range(end, start, receiver.length, null, null));
+            throw H.wrapException(P.RangeError$range(end, start, receiver.length, "end", null));
         }
         if (start === end)
           return H.setRuntimeTypeInfo([], [H.getTypeArgumentByIndex(receiver, 0)]);
         return H.setRuntimeTypeInfo(receiver.slice(start, end), [H.getTypeArgumentByIndex(receiver, 0)]);
       },
       get$first: function(receiver) {
         if (receiver.length > 0)
           return receiver[0];
         throw H.wrapException(H.IterableElementError_noElement());
       },
@@ skipping 84 matching lines @@
       get$isEmpty: function(receiver) {
         return receiver.length === 0;
       },
       get$isNotEmpty: function(receiver) {
         return receiver.length !== 0;
       },
       toString$0: function(receiver) {
         return P.IterableBase_iterableToFullString(receiver, "[", "]");
       },
       toList$1$growable: function(receiver, growable) {
-        var t1;
-        if (growable)
-          t1 = H.setRuntimeTypeInfo(receiver.slice(), [H.getTypeArgumentByIndex(receiver, 0)]);
-        else {
-          t1 = H.setRuntimeTypeInfo(receiver.slice(), [H.getTypeArgumentByIndex(receiver, 0)]);
-          t1.fixed$length = Array;
-          t1 = t1;
-        }
-        return t1;
+        return H.setRuntimeTypeInfo(receiver.slice(), [H.getTypeArgumentByIndex(receiver, 0)]);
       },
       toList$0: function($receiver) {
         return this.toList$1$growable($receiver, true);
       },
       get$iterator: function(receiver) {
         return new J.ArrayIterator(receiver, receiver.length, 0, null);
       },
       get$hashCode: function(receiver) {
         return H.Primitives_objectHashCode(receiver);
       },
       get$length: function(receiver) {
         return receiver.length;
       },
       set$length: function(receiver, newLength) {
         this.checkGrowable$1(receiver, "set length");
+        if (typeof newLength !== "number" || Math.floor(newLength) !== newLength)
+          throw H.wrapException(P.ArgumentError$value(newLength, "newLength", null));
         if (newLength < 0)
           throw H.wrapException(P.RangeError$range(newLength, 0, null, "newLength", null));
         receiver.length = newLength;
       },
       $index: function(receiver, index) {
         if (typeof index !== "number" || Math.floor(index) !== index)
           throw H.wrapException(H.diagnoseIndexError(receiver, index));
         if (index >= receiver.length || index < 0)
           throw H.wrapException(H.diagnoseIndexError(receiver, index));
         return receiver[index];
       },
       $indexSet: function(receiver, index, value) {
         if (!!receiver.immutable$list)
           H.throwExpression(new P.UnsupportedError("indexed set"));
         if (typeof index !== "number" || Math.floor(index) !== index)
           throw H.wrapException(H.diagnoseIndexError(receiver, index));
         if (index >= receiver.length || index < 0)
           throw H.wrapException(H.diagnoseIndexError(receiver, index));
         receiver[index] = value;
       },
       $isJSIndexable: 1,
       $isList: 1,
       $asList: null,
       $isEfficientLength: 1,
       static: {JSArray_JSArray$fixed: function($length, $E) {
           var t1;
-          if (typeof $length !== "number" || Math.floor($length) !== $length || $length < 0)
-            throw H.wrapException(P.ArgumentError$("Length must be a non-negative integer: " + H.S($length)));
+          if (typeof $length !== "number" || Math.floor($length) !== $length)
+            throw H.wrapException(P.ArgumentError$value($length, "length", "is not an integer"));
+          if ($length < 0 || $length > 4294967295)
+            throw H.wrapException(P.RangeError$range($length, 0, 4294967295, "length", null));
           t1 = H.setRuntimeTypeInfo(new Array($length), [$E]);
           t1.fixed$length = Array;
           return t1;
+        }, JSArray_markUnmodifiableList: function(list) {
+          list.fixed$length = Array;
+          list.immutable$list = Array;
+          return list;
         }}
     },
     JSUnmodifiableArray: {
       "^": "JSArray;"
     },
     ArrayIterator: {
-      "^": "Object;__interceptors$_iterable,__interceptors$_length,__interceptors$_index,__interceptors$_current",
+      "^": "Object;_iterable,__interceptors$_length,_index,__interceptors$_current",
       get$current: function() {
         return this.__interceptors$_current;
       },
       moveNext$0: function() {
         var t1, $length, t2;
-        t1 = this.__interceptors$_iterable;
+        t1 = this._iterable;
         $length = t1.length;
         if (this.__interceptors$_length !== $length)
-          throw H.wrapException(new P.ConcurrentModificationError(t1));
-        t2 = this.__interceptors$_index;
+          throw H.wrapException(H.throwConcurrentModificationError(t1));
+        t2 = this._index;
         if (t2 >= $length) {
           this.__interceptors$_current = null;
           return false;
         }
         this.__interceptors$_current = t1[t2];
-        this.__interceptors$_index = t2 + 1;
+        this._index = t2 + 1;
         return true;
       }
     },
     JSNumber: {
       "^": "Interceptor;",
       get$isNegative: function(receiver) {
         return receiver === 0 ? 1 / receiver < 0 : receiver < 0;
       },
-      get$isNaN: function(receiver) {
-        return isNaN(receiver);
-      },
-      get$isFinite: function(receiver) {
-        return isFinite(receiver);
-      },
       remainder$1: function(receiver, b) {
         return receiver % b;
       },
       toInt$0: function(receiver) {
         var t1;
         if (receiver >= -2147483648 && receiver <= 2147483647)
           return receiver | 0;
         if (isFinite(receiver)) {
           t1 = receiver < 0 ? Math.ceil(receiver) : Math.floor(receiver);
           return t1 + 0;
@@ skipping 110 matching lines @@
       $lt: function(receiver, other) {
         if (typeof other !== "number")
           throw H.wrapException(H.argumentErrorValue(other));
         return receiver < other;
       },
       $gt: function(receiver, other) {
         if (typeof other !== "number")
           throw H.wrapException(H.argumentErrorValue(other));
         return receiver > other;
       },
+      $le: function(receiver, other) {
+        if (typeof other !== "number")
+          throw H.wrapException(H.argumentErrorValue(other));
+        return receiver <= other;
+      },
       $ge: function(receiver, other) {
         if (typeof other !== "number")
           throw H.wrapException(H.argumentErrorValue(other));
         return receiver >= other;
       },
       $isnum: 1
     },
     JSInt: {
       "^": "JSNumber;",
       $is$double: 1,
@@ skipping 19 matching lines @@
       allMatches$2: function(receiver, string, start) {
         var t1;
         H.checkString(string);
         H.checkInt(start);
         t1 = J.get$length$asx(string);
         if (typeof t1 !== "number")
           return H.iae(t1);
         t1 = start > t1;
         if (t1)
           throw H.wrapException(P.RangeError$range(start, 0, J.get$length$asx(string), null, null));
-        return H.allMatchesInStringUnchecked(receiver, string, start);
+        return new H._StringAllMatchesIterable(string, receiver, start);
       },
       allMatches$1: function($receiver, string) {
         return this.allMatches$2($receiver, string, 0);
       },
       matchAsPrefix$2: function(receiver, string, start) {
         var t1, t2, i;
         t1 = J.getInterceptor$n(start);
         if (t1.$lt(start, 0) || t1.$gt(start, string.length))
           throw H.wrapException(P.RangeError$range(start, 0, string.length, null, null));
         t2 = receiver.length;
@@ skipping 112 matching lines @@
         for (s = receiver, result = ""; true;) {
           if ((times & 1) === 1)
             result = s + result;
           times = times >>> 1;
           if (times === 0)
             break;
           s += s;
         }
         return result;
       },
-      get$codeUnits: function(receiver) {
-        return new H.CodeUnits(receiver);
-      },
       indexOf$2: function(receiver, pattern, start) {
         if (typeof start !== "number" || Math.floor(start) !== start)
           throw H.wrapException(H.argumentErrorValue(start));
         if (start < 0 || start > receiver.length)
           throw H.wrapException(P.RangeError$range(start, 0, receiver.length, null, null));
         return receiver.indexOf(pattern, start);
       },
       indexOf$1: function($receiver, pattern) {
         return this.indexOf$2($receiver, pattern, 0);
       },
@@ skipping 116 matching lines @@
         }}
     }
   }], ["_isolate_helper", "dart:_isolate_helper",, H, {
     "^": "",
     _callInIsolate: function(isolate, $function) {
       var result = isolate.eval$1($function);
       if (!init.globalState.currentContext._isExecutingEvent)
         init.globalState.topEventLoop.run$0();
       return result;
     },
-    leaveJsAsync: function() {
-      --init.globalState.topEventLoop._activeJsAsyncCount;
-    },
     startRootIsolate: function(entry, args) {
       var t1, t2, t3, t4, t5, rootContext;
       t1 = {};
-      t1._captured_args_0 = args;
-      args = args;
-      t1._captured_args_0 = args;
+      t1.args = args;
       if (args == null) {
         args = [];
-        t1._captured_args_0 = args;
+        t1.args = args;
         t2 = args;
       } else
         t2 = args;
       if (!J.getInterceptor(t2).$isList)
         throw H.wrapException(P.ArgumentError$("Arguments to main must be a List: " + H.S(t2)));
-      t2 = new H._Manager(0, 0, 1, null, null, null, null, null, null, null, null, null, entry);
-      t2._nativeDetectEnvironment$0();
+      init.globalState = new H._Manager(0, 0, 1, null, null, null, null, null, null, null, null, null, entry);
+      t2 = init.globalState;
+      t3 = self.window == null;
+      t4 = self.Worker;
+      t5 = t3 && !!self.postMessage;
+      t2.isWorker = t5;
+      t5 = !t5;
+      if (t5)
+        t4 = t4 != null && $.$get$IsolateNatives_thisScript() != null;
+      else
+        t4 = true;
+      t2.supportsWorkers = t4;
+      t2.fromCommandLine = t3 && t5;
       t2.topEventLoop = new H._EventLoop(P.ListQueue$(null, H._IsolateEvent), 0);
-      t2.isolates = P.LinkedHashMap_LinkedHashMap(null, null, null, P.$int, H._IsolateContext);
-      t2.managers = P.LinkedHashMap_LinkedHashMap(null, null, null, P.$int, null);
+      t2.isolates = H.setRuntimeTypeInfo(new H.JsLinkedHashMap(0, null, null, null, null, null, 0), [P.$int, H._IsolateContext]);
+      t2.managers = H.setRuntimeTypeInfo(new H.JsLinkedHashMap(0, null, null, null, null, null, 0), [P.$int, null]);
       if (t2.isWorker === true) {
-        t2.mainManager = new H._MainManagerStub();
-        t2._nativeInitWorkerMessageHandler$0();
+        t3 = new H._MainManagerStub();
+        t2.mainManager = t3;
+        self.onmessage = function(f, a) {
+          return function(e) {
+            f(a, e);
+          };
+        }(H.IsolateNatives__processWorkerMessage, t3);
+        self.dartPrint = self.dartPrint || function(serialize) {
+          return function(object) {
+            if (self.console && self.console.log)
+              self.console.log(object);
+            else
+              self.postMessage(serialize(object));
+          };
+        }(H._Manager__serializePrintMessage);
       }
-      init.globalState = t2;
       if (init.globalState.isWorker === true)
         return;
       t2 = init.globalState.nextIsolateId++;
-      t3 = P.LinkedHashMap_LinkedHashMap(null, null, null, P.$int, H.RawReceivePortImpl);
+      t3 = H.setRuntimeTypeInfo(new H.JsLinkedHashMap(0, null, null, null, null, null, 0), [P.$int, H.RawReceivePortImpl]);
       t4 = P.LinkedHashSet_LinkedHashSet(null, null, null, P.$int);
       t5 = new H.RawReceivePortImpl(0, null, false);
       rootContext = new H._IsolateContext(t2, t3, t4, init.createNewIsolate(), t5, new H.CapabilityImpl(H.random64()), new H.CapabilityImpl(H.random64()), false, false, [], P.LinkedHashSet_LinkedHashSet(null, null, null, null), null, null, false, true, P.LinkedHashSet_LinkedHashSet(null, null, null, null));
       t4.add$1(0, 0);
       rootContext._addRegistration$2(0, t5);
       init.globalState.rootContext = rootContext;
       init.globalState.currentContext = rootContext;
       t2 = H.getDynamicRuntimeType();
       t3 = H.buildFunctionType(t2, [t2])._isTest$1(entry);
       if (t3)
@@ skipping 38 matching lines @@
       throw H.wrapException(new P.UnsupportedError("Cannot extract URI from \"" + H.S(stack) + "\""));
     },
     IsolateNatives__processWorkerMessage: [function(sender, e) {
       var msg, t1, functionName, entryPoint, args, message, isSpawnUri, startPaused, replyTo, t2, t3, t4, context;
       msg = new H._Deserializer(true, []).deserialize$1(e.data);
       t1 = J.getInterceptor$asx(msg);
       switch (t1.$index(msg, "command")) {
         case "start":
           init.globalState.currentManagerId = t1.$index(msg, "id");
           functionName = t1.$index(msg, "functionName");
-          entryPoint = functionName == null ? init.globalState.entry : H.IsolateNatives__getJSFunctionFromName(functionName);
+          entryPoint = functionName == null ? init.globalState.entry : init.globalFunctions[functionName]();
           args = t1.$index(msg, "args");
           message = new H._Deserializer(true, []).deserialize$1(t1.$index(msg, "msg"));
           isSpawnUri = t1.$index(msg, "isSpawnUri");
           startPaused = t1.$index(msg, "startPaused");
           replyTo = new H._Deserializer(true, []).deserialize$1(t1.$index(msg, "replyTo"));
           t1 = init.globalState.nextIsolateId++;
-          t2 = P.LinkedHashMap_LinkedHashMap(null, null, null, P.$int, H.RawReceivePortImpl);
+          t2 = H.setRuntimeTypeInfo(new H.JsLinkedHashMap(0, null, null, null, null, null, 0), [P.$int, H.RawReceivePortImpl]);
           t3 = P.LinkedHashSet_LinkedHashSet(null, null, null, P.$int);
           t4 = new H.RawReceivePortImpl(0, null, false);
           context = new H._IsolateContext(t1, t2, t3, init.createNewIsolate(), t4, new H.CapabilityImpl(H.random64()), new H.CapabilityImpl(H.random64()), false, false, [], P.LinkedHashSet_LinkedHashSet(null, null, null, null), null, null, false, true, P.LinkedHashSet_LinkedHashSet(null, null, null, null));
           t3.add$1(0, 0);
           context._addRegistration$2(0, t4);
           init.globalState.topEventLoop.events._add$1(new H._IsolateEvent(context, new H.IsolateNatives__processWorkerMessage_closure(entryPoint, args, message, isSpawnUri, startPaused, replyTo), "worker-start"));
           init.globalState.currentContext = context;
           init.globalState.topEventLoop.run$0();
           break;
         case "spawn-worker":
           break;
         case "message":
           if (t1.$index(msg, "port") != null)
             J.send$1$x(t1.$index(msg, "port"), t1.$index(msg, "msg"));
           init.globalState.topEventLoop.run$0();
           break;
         case "close":
           init.globalState.managers.remove$1(0, $.$get$IsolateNatives_workerIds().$index(0, sender));
           sender.terminate();
           init.globalState.topEventLoop.run$0();
           break;
         case "log":
           H.IsolateNatives__log(t1.$index(msg, "msg"));
           break;
         case "print":
           if (init.globalState.isWorker === true) {
             t1 = init.globalState.mainManager;
             t2 = P.LinkedHashMap__makeLiteral(["command", "print", "msg", msg]);
-            t2 = new H._Serializer(true, P.LinkedHashMap_LinkedHashMap$identity(null, P.$int)).serialize$1(t2);
+            t2 = new H._Serializer(true, P._LinkedIdentityHashMap__LinkedIdentityHashMap$es6(null, P.$int)).serialize$1(t2);
             t1.toString;
             self.postMessage(t2);
           } else
             P.print(t1.$index(msg, "msg"));
           break;
         case "error":
           throw H.wrapException(t1.$index(msg, "msg"));
       }
-    }, null, null, 4, 0, null, 29, 23],
+    }, null, null, 4, 0, null, 32, 33],
     IsolateNatives__log: function(msg) {
       var trace, t1, t2, exception;
       if (init.globalState.isWorker === true) {
         t1 = init.globalState.mainManager;
         t2 = P.LinkedHashMap__makeLiteral(["command", "log", "msg", msg]);
-        t2 = new H._Serializer(true, P.LinkedHashMap_LinkedHashMap$identity(null, P.$int)).serialize$1(t2);
+        t2 = new H._Serializer(true, P._LinkedIdentityHashMap__LinkedIdentityHashMap$es6(null, P.$int)).serialize$1(t2);
         t1.toString;
         self.postMessage(t2);
       } else
         try {
           self.console.log(msg);
         } catch (exception) {
           H.unwrapException(exception);
           trace = H.getTraceFromException(exception);
           throw H.wrapException(P.Exception_Exception(trace));
         }
     },
-    IsolateNatives__getJSFunctionFromName: function(functionName) {
-      return init.globalFunctions[functionName]();
-    },
     IsolateNatives__startIsolate: function(topLevel, args, message, isSpawnUri, startPaused, replyTo) {
       var context, t1, t2, t3;
       context = init.globalState.currentContext;
       t1 = context.id;
       $.Primitives_mirrorFunctionCacheName = $.Primitives_mirrorFunctionCacheName + ("_" + t1);
       $.Primitives_mirrorInvokeCacheName = $.Primitives_mirrorInvokeCacheName + ("_" + t1);
       t1 = context.controlPort;
       t2 = init.globalState.currentContext.id;
       t3 = context.pauseCapability;
       J.send$1$x(replyTo, ["spawned", new H._NativeJsSendPort(t1, t2), t3, context.terminateCapability]);
       t2 = new H.IsolateNatives__startIsolate_runStartFunction(topLevel, args, message, isSpawnUri, context);
       if (startPaused === true) {
         context.addPause$2(t3, t3);
         init.globalState.topEventLoop.events._add$1(new H._IsolateEvent(context, t2, "start isolate"));
       } else
         t2.call$0();
     },
     _clone: function(message) {
-      return new H._Deserializer(true, []).deserialize$1(new H._Serializer(false, P.LinkedHashMap_LinkedHashMap$identity(null, P.$int)).serialize$1(message));
+      return new H._Deserializer(true, []).deserialize$1(new H._Serializer(false, P._LinkedIdentityHashMap__LinkedIdentityHashMap$es6(null, P.$int)).serialize$1(message));
     },
     startRootIsolate_closure: {
-      "^": "Closure:1;__isolate_helper$_box_0,_captured_entry_1",
+      "^": "Closure:1;_box_0,entry",
       call$0: function() {
-        this._captured_entry_1.call$1(this.__isolate_helper$_box_0._captured_args_0);
+        this.entry.call$1(this._box_0.args);
       }
     },
     startRootIsolate_closure0: {
-      "^": "Closure:1;__isolate_helper$_box_0,_captured_entry_2",
+      "^": "Closure:1;_box_0,entry",
       call$0: function() {
-        this._captured_entry_2.call$2(this.__isolate_helper$_box_0._captured_args_0, null);
+        this.entry.call$2(this._box_0.args, null);
       }
     },
     _Manager: {
       "^": "Object;nextIsolateId,currentManagerId,nextManagerId,currentContext,rootContext,topEventLoop,fromCommandLine,isWorker,supportsWorkers,isolates,mainManager,managers,entry",
-      _nativeDetectEnvironment$0: function() {
-        var t1, t2, t3;
-        t1 = self.window == null;
-        t2 = self.Worker;
-        t3 = t1 && !!self.postMessage;
-        this.isWorker = t3;
-        if (!t3)
-          t2 = t2 != null && $.$get$IsolateNatives_thisScript() != null;
-        else
-          t2 = true;
-        this.supportsWorkers = t2;
-        this.fromCommandLine = t1 && !t3;
-      },
-      _nativeInitWorkerMessageHandler$0: function() {
-        self.onmessage = function(f, a) {
-          return function(e) {
-            f(a, e);
-          };
-        }(H.IsolateNatives__processWorkerMessage, this.mainManager);
-        self.dartPrint = self.dartPrint || function(serialize) {
-          return function(object) {
-            if (self.console && self.console.log)
-              self.console.log(object);
-            else
-              self.postMessage(serialize(object));
-          };
-        }(H._Manager__serializePrintMessage);
-      },
       static: {_Manager__serializePrintMessage: [function(object) {
           var t1 = P.LinkedHashMap__makeLiteral(["command", "print", "msg", object]);
-          return new H._Serializer(true, P.LinkedHashMap_LinkedHashMap$identity(null, P.$int)).serialize$1(t1);
-        }, null, null, 2, 0, null, 20]}
+          return new H._Serializer(true, P._LinkedIdentityHashMap__LinkedIdentityHashMap$es6(null, P.$int)).serialize$1(t1);
+        }, null, null, 2, 0, null, 19]}
     },
     _IsolateContext: {
       "^": "Object;id,ports,weakPorts,isolateStatics<,controlPort<,pauseCapability,terminateCapability,initialized?,isPaused<,delayedEvents<,pauseTokens,doneHandlers,_scheduledControlEvents,_isExecutingEvent,errorsAreFatal,errorPorts",
       addPause$2: function(authentification, resume) {
         if (!this.pauseCapability.$eq(0, authentification))
           return;
         if (this.pauseTokens.add$1(0, resume) && !this.isPaused)
           this.isPaused = true;
         this._updateGlobalState$0();
       },
       removePause$1: function(resume) {
         var t1, t2, $event, t3, t4, t5;
         if (!this.isPaused)
           return;
         t1 = this.pauseTokens;
         t1.remove$1(0, resume);
         if (t1._collection$_length === 0) {
           for (t1 = this.delayedEvents; t2 = t1.length, t2 !== 0;) {
             if (0 >= t2)
-              return H.ioore(t1, 0);
+              return H.ioore(t1, -1);
             $event = t1.pop();
             t2 = init.globalState.topEventLoop.events;
             t3 = t2._head;
             t4 = t2._table;
             t5 = t4.length;
             t3 = (t3 - 1 & t5 - 1) >>> 0;
             t2._head = t3;
             if (t3 < 0 || t3 >= t5)
               return H.ioore(t4, t3);
             t4[t3] = $event;
@@ skipping 87 matching lines @@
             return;
           if (self.console && self.console.error)
             self.console.error(error, stackTrace);
           else {
             P.print(error);
             if (stackTrace != null)
               P.print(stackTrace);
           }
           return;
         }
-        message = Array(2);
+        message = new Array(2);
         message.fixed$length = Array;
         message[0] = J.toString$0$(error);
         message[1] = stackTrace == null ? null : J.toString$0$(stackTrace);
-        for (t2 = new P.LinkedHashSetIterator(t1, t1._collection$_modifications, null, null), t2._collection$_cell = t1._collection$_first; t2.moveNext$0();)
+        for (t2 = new P._LinkedHashSetIterator(t1, t1._collection$_modifications, null, null), t2._collection$_cell = t1._collection$_first; t2.moveNext$0();)
           J.send$1$x(t2._collection$_current, message);
-      }, "call$2", "get$handleUncaughtError", 4, 0, 18],
+      }, "call$2", "get$handleUncaughtError", 4, 0, 11],
       eval$1: function(code) {
         var old, result, oldIsExecutingEvent, e, s, exception, t1;
         old = init.globalState.currentContext;
         init.globalState.currentContext = this;
         $ = this.isolateStatics;
         result = null;
         oldIsExecutingEvent = this._isExecutingEvent;
         this._isExecutingEvent = true;
         try {
           result = code.call$0();
@@ skipping 83 matching lines @@
             t3 = i + 1;
             if (t3 >= t2)
               return H.ioore(t1, t3);
             J.send$1$x(responsePort, t1[t3]);
           }
           this.doneHandlers = null;
         }
       }, "call$0", "get$kill", 0, 0, 2]
     },
     _IsolateContext_handlePing_respond: {
-      "^": "Closure:2;_captured_responsePort_0,_captured_response_1",
+      "^": "Closure:2;responsePort,response",
       call$0: [function() {
-        J.send$1$x(this._captured_responsePort_0, this._captured_response_1);
+        J.send$1$x(this.responsePort, this.response);
       }, null, null, 0, 0, null, "call"]
     },
     _EventLoop: {
       "^": "Object;events,_activeJsAsyncCount",
       dequeue$0: function() {
         var t1 = this.events;
         if (t1._head === t1._tail)
           return;
         return t1.removeFirst$0();
       },
@@ skipping 16 matching lines @@
             H.throwExpression(P.Exception_Exception("Program exited with open ReceivePorts."));
           t1 = init.globalState;
           if (t1.isWorker === true) {
             t2 = t1.isolates;
             t2 = t2.get$isEmpty(t2) && t1.topEventLoop._activeJsAsyncCount === 0;
           } else
             t2 = false;
           if (t2) {
             t1 = t1.mainManager;
             t2 = P.LinkedHashMap__makeLiteral(["command", "close"]);
-            t2 = new H._Serializer(true, P.LinkedHashMap_LinkedHashMap$identity(null, P.$int)).serialize$1(t2);
+            t2 = new H._Serializer(true, H.setRuntimeTypeInfo(new P._LinkedIdentityHashMap(0, null, null, null, null, null, 0), [null, P.$int])).serialize$1(t2);
             t1.toString;
             self.postMessage(t2);
           }
           return false;
         }
         $event.process$0();
         return true;
       },
       _runHelper$0: function() {
         if (self.window != null)
           new H._EventLoop__runHelper_next(this).call$0();
         else
           for (; this.runIteration$0();)
             ;
       },
       run$0: [function() {
         var e, trace, exception, t1, t2;
         if (init.globalState.isWorker !== true)
           this._runHelper$0();
         else
           try {
             this._runHelper$0();
           } catch (exception) {
             t1 = H.unwrapException(exception);
             e = t1;
             trace = H.getTraceFromException(exception);
             t1 = init.globalState.mainManager;
             t2 = P.LinkedHashMap__makeLiteral(["command", "error", "msg", H.S(e) + "\n" + H.S(trace)]);
-            t2 = new H._Serializer(true, P.LinkedHashMap_LinkedHashMap$identity(null, P.$int)).serialize$1(t2);
+            t2 = new H._Serializer(true, P._LinkedIdentityHashMap__LinkedIdentityHashMap$es6(null, P.$int)).serialize$1(t2);
             t1.toString;
             self.postMessage(t2);
           }
       }, "call$0", "get$run", 0, 0, 2]
     },
     _EventLoop__runHelper_next: {
-      "^": "Closure:2;_captured_this_0",
+      "^": "Closure:2;$this",
       call$0: [function() {
-        if (!this._captured_this_0.runIteration$0())
+        if (!this.$this.runIteration$0())
           return;
         P.Timer_Timer(C.Duration_0, this);
       }, null, null, 0, 0, null, "call"]
     },
     _IsolateEvent: {
       "^": "Object;isolate,fn,message>",
       process$0: function() {
         var t1 = this.isolate;
         if (t1.get$isPaused()) {
           t1.get$delayedEvents().push(this);
           return;
         }
         t1.eval$1(this.fn);
       }
     },
     _MainManagerStub: {
       "^": "Object;"
     },
     IsolateNatives__processWorkerMessage_closure: {
-      "^": "Closure:1;_captured_entryPoint_0,_captured_args_1,_captured_message_2,_captured_isSpawnUri_3,_captured_startPaused_4,_captured_replyTo_5",
+      "^": "Closure:1;entryPoint,args,message,isSpawnUri,startPaused,replyTo",
       call$0: function() {
-        H.IsolateNatives__startIsolate(this._captured_entryPoint_0, this._captured_args_1, this._captured_message_2, this._captured_isSpawnUri_3, this._captured_startPaused_4, this._captured_replyTo_5);
+        H.IsolateNatives__startIsolate(this.entryPoint, this.args, this.message, this.isSpawnUri, this.startPaused, this.replyTo);
       }
     },
     IsolateNatives__startIsolate_runStartFunction: {
-      "^": "Closure:2;_captured_topLevel_0,_captured_args_1,_captured_message_2,_captured_isSpawnUri_3,_captured_context_4",
+      "^": "Closure:2;topLevel,args,message,isSpawnUri,context",
       call$0: function() {
-        var t1, t2, t3;
-        this._captured_context_4.set$initialized(true);
-        if (this._captured_isSpawnUri_3 !== true)
-          this._captured_topLevel_0.call$1(this._captured_message_2);
+        var t1, t2, t3, t4;
+        t1 = this.context;
+        t1.set$initialized(true);
+        if (this.isSpawnUri !== true)
+          this.topLevel.call$1(this.message);
         else {
-          t1 = this._captured_topLevel_0;
-          t2 = H.getDynamicRuntimeType();
-          t3 = H.buildFunctionType(t2, [t2, t2])._isTest$1(t1);
-          if (t3)
-            t1.call$2(this._captured_args_1, this._captured_message_2);
+          t2 = this.topLevel;
+          t3 = H.getDynamicRuntimeType();
+          t4 = H.buildFunctionType(t3, [t3, t3])._isTest$1(t2);
+          if (t4)
+            t2.call$2(this.args, this.message);
           else {
-            t2 = H.buildFunctionType(t2, [t2])._isTest$1(t1);
-            if (t2)
-              t1.call$1(this._captured_args_1);
+            t3 = H.buildFunctionType(t3, [t3])._isTest$1(t2);
+            if (t3)
+              t2.call$1(this.args);
             else
-              t1.call$0();
+              t2.call$0();
           }
         }
+        t1._updateGlobalState$0();
       }
     },
     _BaseSendPort: {
       "^": "Object;"
     },
     _NativeJsSendPort: {
       "^": "_BaseSendPort;_receivePort,_isolateId",
       send$1: function(_, message) {
         var isolate, t1, msg, t2;
         isolate = init.globalState.isolates.$index(0, this._isolateId);
@@ skipping 14 matching lines @@
       $eq: function(_, other) {
         if (other == null)
           return false;
         return other instanceof H._NativeJsSendPort && J.$eq$(this._receivePort, other._receivePort);
       },
       get$hashCode: function(_) {
         return this._receivePort.get$_id();
       }
     },
     _NativeJsSendPort_send_closure: {
-      "^": "Closure:1;_captured_this_0,_captured_msg_1",
+      "^": "Closure:1;$this,msg",
       call$0: function() {
-        var t1 = this._captured_this_0._receivePort;
+        var t1 = this.$this._receivePort;
         if (!t1.get$_isClosed())
-          t1.__isolate_helper$_add$1(this._captured_msg_1);
+          t1.__isolate_helper$_add$1(this.msg);
       }
     },
     _WorkerSendPort: {
       "^": "_BaseSendPort;_workerId,_receivePortId,_isolateId",
       send$1: function(_, message) {
         var t1, workerMessage, manager;
         t1 = P.LinkedHashMap__makeLiteral(["command", "message", "port", this, "msg", message]);
-        workerMessage = new H._Serializer(true, P.LinkedHashMap_LinkedHashMap$identity(null, P.$int)).serialize$1(t1);
+        workerMessage = new H._Serializer(true, P._LinkedIdentityHashMap__LinkedIdentityHashMap$es6(null, P.$int)).serialize$1(t1);
         if (init.globalState.isWorker === true) {
           init.globalState.mainManager.toString;
           self.postMessage(workerMessage);
         } else {
           manager = init.globalState.managers.$index(0, this._workerId);
           if (manager != null)
             manager.postMessage(workerMessage);
         }
       },
       $eq: function(_, other) {
@@ skipping 10 matching lines @@
           return H.iae(t3);
         return (t1 ^ t2 ^ t3) >>> 0;
       }
     },
     RawReceivePortImpl: {
       "^": "Object;_id<,_handler,_isClosed<",
       __isolate_helper$_close$0: function() {
         this._isClosed = true;
         this._handler = null;
       },
-      close$0: function(_) {
-        var t1, t2;
-        if (this._isClosed)
-          return;
-        this._isClosed = true;
-        this._handler = null;
-        t1 = init.globalState.currentContext;
-        t2 = this._id;
-        t1.ports.remove$1(0, t2);
-        t1.weakPorts.remove$1(0, t2);
-        t1._updateGlobalState$0();
-      },
       __isolate_helper$_add$1: function(dataEvent) {
         if (this._isClosed)
           return;
         this._handler$1(dataEvent);
       },
       _handler$1: function(arg0) {
         return this._handler.call$1(arg0);
       },
       $isRawReceivePort: 1
     },
@@ skipping 28 matching lines @@
           var t1 = new H.TimerImpl(true, false, null);
           t1.TimerImpl$2(milliseconds, callback);
           return t1;
         }, TimerImpl$periodic: function(milliseconds, callback) {
           var t1 = new H.TimerImpl(false, false, null);
           t1.TimerImpl$periodic$2(milliseconds, callback);
           return t1;
         }}
     },
     TimerImpl_internalCallback: {
-      "^": "Closure:2;_captured_this_0,_captured_callback_1",
+      "^": "Closure:2;$this,callback",
       call$0: function() {
-        this._captured_this_0._handle = null;
-        this._captured_callback_1.call$0();
+        this.$this._handle = null;
+        this.callback.call$0();
       }
     },
     TimerImpl_internalCallback0: {
-      "^": "Closure:2;_captured_this_2,_captured_callback_3",
+      "^": "Closure:2;$this,callback",
       call$0: [function() {
-        this._captured_this_2._handle = null;
-        H.leaveJsAsync();
-        this._captured_callback_3.call$0();
+        this.$this._handle = null;
+        --init.globalState.topEventLoop._activeJsAsyncCount;
+        this.callback.call$0();
       }, null, null, 0, 0, null, "call"]
     },
     TimerImpl$periodic_closure: {
-      "^": "Closure:1;_captured_this_0,_captured_callback_1",
+      "^": "Closure:1;$this,callback",
       call$0: [function() {
-        this._captured_callback_1.call$1(this._captured_this_0);
+        this.callback.call$1(this.$this);
       }, null, null, 0, 0, null, "call"]
     },
     CapabilityImpl: {
       "^": "Object;_id<",
       get$hashCode: function(_) {
         var hash, t1, t2;
         hash = this._id;
         t1 = J.getInterceptor$n(hash);
         t2 = t1.$shr(hash, 0);
         t1 = t1.$tdiv(hash, 4294967296);
@@ skipping 50 matching lines @@
           return this.serializeJSObject$1(x);
         if (!!t1.$isInterceptor)
           this.unsupported$1(x);
         if (!!t1.$isRawReceivePort)
           this.unsupported$2(x, "RawReceivePorts can't be transmitted:");
         if (!!t1.$is_NativeJsSendPort)
           return this.serializeJsSendPort$1(x);
         if (!!t1.$is_WorkerSendPort)
           return this.serializeWorkerSendPort$1(x);
         if (!!t1.$isClosure) {
-          $name = x.$name;
+          $name = x.$static_name;
           if ($name == null)
             this.unsupported$2(x, "Closures can't be transmitted:");
           return ["function", $name];
         }
         if (!!t1.$isCapabilityImpl)
           return ["capability", x._id];
         if (!(x instanceof P.Object))
           this.unsupported$1(x);
         return ["dart", init.classIdExtractor(x), this.serializeArrayInPlace$1(init.classFieldsExtractor(x))];
-      }, "call$1", "get$serialize", 2, 0, 0, 17],
+      }, "call$1", "get$serialize", 2, 0, 0, 25],
       unsupported$2: function(x, message) {
         throw H.wrapException(new P.UnsupportedError(H.S(message == null ? "Can't transmit:" : message) + " " + H.S(x)));
       },
       unsupported$1: function(x) {
         return this.unsupported$2(x, null);
       },
       serializeJSIndexable$1: function(indexable) {
         var serialized = this.serializeArray$1(indexable);
         if (!!indexable.fixed$length)
           return ["fixed", serialized];
@@ skipping 76 matching lines @@
             if (1 >= x.length)
               return H.ioore(x, 1);
             result = x[1];
             this.deserializedObjects.push(result);
             return result;
           case "fixed":
             if (1 >= x.length)
               return H.ioore(x, 1);
             result = x[1];
             this.deserializedObjects.push(result);
-            t1 = this.deserializeArrayInPlace$1(result);
-            t1.$builtinTypeInfo = [null];
+            t1 = H.setRuntimeTypeInfo(this.deserializeArrayInPlace$1(result), [null]);
             t1.fixed$length = Array;
             return t1;
           case "extendable":
             if (1 >= x.length)
               return H.ioore(x, 1);
             result = x[1];
             this.deserializedObjects.push(result);
-            t1 = this.deserializeArrayInPlace$1(result);
-            t1.$builtinTypeInfo = [null];
-            return t1;
+            return H.setRuntimeTypeInfo(this.deserializeArrayInPlace$1(result), [null]);
           case "mutable":
             if (1 >= x.length)
               return H.ioore(x, 1);
             result = x[1];
             this.deserializedObjects.push(result);
             return this.deserializeArrayInPlace$1(result);
           case "const":
             if (1 >= x.length)
               return H.ioore(x, 1);
             result = x[1];
             this.deserializedObjects.push(result);
-            t1 = this.deserializeArrayInPlace$1(result);
-            t1.$builtinTypeInfo = [null];
+            t1 = H.setRuntimeTypeInfo(this.deserializeArrayInPlace$1(result), [null]);
             t1.fixed$length = Array;
             return t1;
           case "map":
             return this.deserializeMap$1(x);
           case "sendport":
             return this.deserializeSendPort$1(x);
           case "raw sendport":
             if (1 >= x.length)
               return H.ioore(x, 1);
             result = x[1];
@@ skipping 19 matching lines @@
             if (2 >= t1)
               return H.ioore(x, 2);
             fields = x[2];
             emptyInstance = init.instanceFromClassId(classId);
             this.deserializedObjects.push(emptyInstance);
             this.deserializeArrayInPlace$1(fields);
             return init.initializeEmptyInstance(classId, emptyInstance, fields);
           default:
             throw H.wrapException("couldn't deserialize: " + H.S(x));
         }
-      }, "call$1", "get$deserialize", 2, 0, 0, 17],
+      }, "call$1", "get$deserialize", 2, 0, 0, 25],
       deserializeArrayInPlace$1: function(x) {
         var t1, i, t2;
         t1 = J.getInterceptor$asx(x);
         i = 0;
         while (true) {
           t2 = t1.get$length(x);
           if (typeof t2 !== "number")
             return H.iae(t2);
           if (!(i < t2))
             break;
@@ skipping 138 matching lines @@
       if (radix < 10 || decimalMatch == null) {
         maxCharCode = radix <= 10 ? 47 + radix : 86 + radix;
         digitsPart = match[1];
         for (t1 = digitsPart.length, i = 0; i < t1; ++i)
           if ((C.JSString_methods.codeUnitAt$1(digitsPart, i) | 32) > maxCharCode)
             return H.Primitives__parseIntError(source, handleError);
       }
       return parseInt(source, radix);
     },
     Primitives_objectTypeName: function(object) {
-      var $name, decompiled;
-      $name = C.JS_CONST_8ZY(J.getInterceptor(object));
-      if ($name === "Object") {
-        decompiled = String(object.constructor).match(/^\s*function\s*([\w$]*)\s*\(/)[1];
-        if (typeof decompiled === "string")
-          $name = /^\w+$/.test(decompiled) ? decompiled : $name;
+      var interceptor, interceptorConstructor, interceptorConstructorName, $name, dispatchName, objectConstructor, decompiledName;
+      interceptor = J.getInterceptor(object);
+      interceptorConstructor = interceptor.constructor;
+      if (typeof interceptorConstructor == "function") {
+        interceptorConstructorName = interceptorConstructor.name;
+        $name = typeof interceptorConstructorName === "string" ? interceptorConstructorName : null;
+      } else
+        $name = null;
+      if ($name == null || interceptor === C.Interceptor_methods || !!J.getInterceptor(object).$isUnknownJavaScriptObject) {
+        dispatchName = C.JS_CONST_8ZY(object);
+        if (dispatchName === "Object") {
+          objectConstructor = object.constructor;
+          if (typeof objectConstructor == "function") {
+            decompiledName = String(objectConstructor).match(/^\s*function\s*([\w$]*)\s*\(/)[1];
+            if (typeof decompiledName === "string" && /^\w+$/.test(decompiledName))
+              $name = decompiledName;
+          }
+          if ($name == null)
+            $name = dispatchName;
+        } else
+          $name = dispatchName;
       }
+      $name = $name;
       if ($name.length > 1 && C.JSString_methods.codeUnitAt$1($name, 0) === 36)
         $name = C.JSString_methods.substring$1($name, 1);
-      return ($name + H.joinArguments(H.getRuntimeTypeInfo(object), 0, null)).replace(/[^<,> ]+/g, function(m) {
-        return init.mangledGlobalNames[m] || m;
-      });
+      return function(str, names) {
+        return str.replace(/[^<,> ]+/g, function(m) {
+          return names[m] || m;
+        });
+      }($name + H.joinArguments(H.getRuntimeTypeInfo(object), 0, null), init.mangledGlobalNames);
     },
     Primitives_objectToHumanReadableString: function(object) {
       return "Instance of '" + H.Primitives_objectTypeName(object) + "'";
     },
     Primitives_currentUri: function() {
       if (!!self.location)
         return self.location.href;
       return;
     },
     Primitives__fromCharCodeApply: function(array) {
       var end, result, i, i0, chunkEnd;
       end = array.length;
       if (end <= 500)
         return String.fromCharCode.apply(null, array);
       for (result = "", i = 0; i < end; i = i0) {
         i0 = i + 500;
         chunkEnd = i0 < end ? i0 : end;
         result += String.fromCharCode.apply(null, array.slice(i, chunkEnd));
       }
       return result;
     },
     Primitives_stringFromCodePoints: function(codePoints) {
       var a, t1, _i, i;
-      a = [];
-      a.$builtinTypeInfo = [P.$int];
+      a = H.setRuntimeTypeInfo([], [P.$int]);
       for (t1 = codePoints.length, _i = 0; _i < codePoints.length; codePoints.length === t1 || (0, H.throwConcurrentModificationError)(codePoints), ++_i) {
         i = codePoints[_i];
         if (typeof i !== "number" || Math.floor(i) !== i)
           throw H.wrapException(H.argumentErrorValue(i));
         if (i <= 65535)
           a.push(i);
         else if (i <= 1114111) {
           a.push(55296 + (C.JSInt_methods._shrOtherPositive$1(i - 65536, 10) & 1023));
           a.push(56320 + (i & 1023));
         } else
           throw H.wrapException(H.argumentErrorValue(i));
       }
       return H.Primitives__fromCharCodeApply(a);
     },
     Primitives_stringFromCharCodes: function(charCodes) {
       var t1, _i, t2, i;
       for (t1 = charCodes.length, _i = 0; t2 = charCodes.length, _i < t2; t2 === t1 || (0, H.throwConcurrentModificationError)(charCodes), ++_i) {
         i = charCodes[_i];
         if (typeof i !== "number" || Math.floor(i) !== i)
           throw H.wrapException(H.argumentErrorValue(i));
         if (i < 0)
           throw H.wrapException(H.argumentErrorValue(i));
         if (i > 65535)
           return H.Primitives_stringFromCodePoints(charCodes);
       }
       return H.Primitives__fromCharCodeApply(charCodes);
     },
+    Primitives_stringFromNativeUint8List: function(charCodes, start, end) {
+      var t1, i, result, i0, chunkEnd;
+      t1 = J.getInterceptor$n(end);
+      if (t1.$le(end, 500) && start === 0 && t1.$eq(end, charCodes.length))
+        return String.fromCharCode.apply(null, charCodes);
+      if (typeof end !== "number")
+        return H.iae(end);
+      i = start;
+      result = "";
+      for (; i < end; i = i0) {
+        i0 = i + 500;
+        if (i0 < end)
+          chunkEnd = i0;
+        else
+          chunkEnd = end;
+        result += String.fromCharCode.apply(null, charCodes.subarray(i, chunkEnd));
+      }
+      return result;
+    },
     Primitives_stringFromCharCode: function(charCode) {
       var bits;
       if (typeof charCode !== "number")
         return H.iae(charCode);
       if (0 <= charCode) {
         if (charCode <= 65535)
           return String.fromCharCode(charCode);
         if (charCode <= 1114111) {
           bits = charCode - 65536;
           return String.fromCharCode((55296 | C.JSInt_methods._shrOtherPositive$1(bits, 10)) >>> 0, 56320 | bits & 1023);
         }
       }
       throw H.wrapException(P.RangeError$range(charCode, 0, 1114111, null, null));
     },
     Primitives_lazyAsJsDate: function(receiver) {
       if (receiver.date === void 0)
-        receiver.date = new Date(receiver.millisecondsSinceEpoch);
+        receiver.date = new Date(receiver._core$_value);
       return receiver.date;
     },
     Primitives_getProperty: function(object, key) {
       if (object == null || typeof object === "boolean" || typeof object === "number" || typeof object === "string")
         throw H.wrapException(H.argumentErrorValue(object));
       return object[key];
     },
     Primitives_setProperty: function(object, key, value) {
       if (object == null || typeof object === "boolean" || typeof object === "number" || typeof object === "string")
         throw H.wrapException(H.argumentErrorValue(object));
       object[key] = value;
     },
     Primitives_functionNoSuchMethod: function($function, positionalArguments, namedArguments) {
       var t1, $arguments, namedArgumentList;
       t1 = {};
-      t1._captured_argumentCount_0 = 0;
+      t1.argumentCount = 0;
       $arguments = [];
       namedArgumentList = [];
-      t1._captured_argumentCount_0 = positionalArguments.length;
+      t1.argumentCount = positionalArguments.length;
       C.JSArray_methods.addAll$1($arguments, positionalArguments);
-      t1._captured_names_1 = "";
+      t1.names = "";
       if (namedArguments != null && !namedArguments.get$isEmpty(namedArguments))
         namedArguments.forEach$1(0, new H.Primitives_functionNoSuchMethod_closure(t1, $arguments, namedArgumentList));
-      return J.noSuchMethod$1$($function, new H.JSInvocationMirror(C.Symbol_call, "call" + "$" + t1._captured_argumentCount_0 + t1._captured_names_1, 0, $arguments, namedArgumentList, null));
+      return J.noSuchMethod$1$($function, new H.JSInvocationMirror(C.Symbol_call, "call" + "$" + t1.argumentCount + t1.names, 0, $arguments, namedArgumentList, null));
     },
     Primitives_applyFunctionWithPositionalArguments: function($function, positionalArguments) {
       var $arguments, t1;
       $arguments = positionalArguments instanceof Array ? positionalArguments : P.List_List$from(positionalArguments, true, null);
       t1 = $arguments.length;
       if (t1 === 0) {
         if (!!$function.call$0)
           return $function.call$0();
       } else if (t1 === 1) {
         if (!!$function.call$1)
@@ skipping 41 matching lines @@
       if (!(index < 0)) {
         if (typeof $length !== "number")
           return H.iae($length);
         t1 = index >= $length;
       } else
         t1 = true;
       if (t1)
         return P.IndexError$(index, indexable, "index", null, $length);
       return P.RangeError$value(index, "index", null);
     },
+    diagnoseRangeError: function(start, end, $length) {
+      if (start > $length)
+        return new P.RangeError(0, $length, true, start, "start", "Invalid value");
+      if (end != null)
+        if (end < start || end > $length)
+          return new P.RangeError(start, $length, true, end, "end", "Invalid value");
+      return new P.ArgumentError(true, end, "end", null);
+    },
     argumentErrorValue: function(object) {
       return new P.ArgumentError(true, object, null, null);
     },
     checkInt: function(value) {
       if (typeof value !== "number" || Math.floor(value) !== value)
         throw H.wrapException(H.argumentErrorValue(value));
       return value;
     },
     checkString: function(value) {
       if (typeof value !== "string")
@@ skipping 156 matching lines @@
       else if (t1.$eq(numberOfArguments, 1))
         return H._callInIsolate(isolate, new H.invokeClosure_closure0(closure, arg1));
       else if (t1.$eq(numberOfArguments, 2))
         return H._callInIsolate(isolate, new H.invokeClosure_closure1(closure, arg1, arg2));
       else if (t1.$eq(numberOfArguments, 3))
         return H._callInIsolate(isolate, new H.invokeClosure_closure2(closure, arg1, arg2, arg3));
       else if (t1.$eq(numberOfArguments, 4))
         return H._callInIsolate(isolate, new H.invokeClosure_closure3(closure, arg1, arg2, arg3, arg4));
       else
         throw H.wrapException(P.Exception_Exception("Unsupported number of arguments for wrapped closure"));
-    }, null, null, 14, 0, null, 26, 27, 43, 22, 18, 31, 28],
+    }, null, null, 14, 0, null, 43, 44, 27, 20, 21, 28, 29],
     convertDartClosureToJS: function(closure, arity) {
       var $function;
       if (closure == null)
         return;
       $function = closure.$identity;
       if (!!$function)
         return $function;
       $function = function(closure, arity, context, invoke) {
         return function(a1, a2, a3, a4) {
           return invoke(closure, context, arity, a1, a2, a3, a4);
@@ skipping 24 matching lines @@
         $constructor = t1;
       }
       $prototype.constructor = $constructor;
       $constructor.prototype = $prototype;
       t1 = !isStatic;
       if (t1) {
         isIntercepted = jsArguments.length == 1 && true;
         trampoline = H.Closure_forwardCallTo(receiver, $function, isIntercepted);
         trampoline.$reflectionInfo = reflectionInfo;
       } else {
-        $prototype.$name = propertyName;
+        $prototype.$static_name = propertyName;
         trampoline = $function;
         isIntercepted = false;
       }
       if (typeof functionType == "number")
-        signatureFunction = function(t) {
+        signatureFunction = function(getType, t) {
           return function() {
-            return H.getType(t);
+            return getType(t);
           };
-        }(functionType);
+        }(H.getType, functionType);
       else if (t1 && typeof functionType == "function") {
         getReceiver = isIntercepted ? H.BoundClosure_receiverOf : H.BoundClosure_selfOf;
         signatureFunction = function(f, r) {
           return function() {
             return f.apply({$receiver: r(this)}, arguments);
           };
         }(functionType, getReceiver);
       } else
         throw H.wrapException("Error in reflectionInfo.");
       $prototype.$signature = signatureFunction;
@@ skipping 180 matching lines @@
         t1 = reflectionInfo;
       } else
         t1 = reflectionInfo;
       return H.Closure_fromTearOff(receiver, functions, t1, !!isStatic, jsArguments, $name);
     },
     intTypeCast: function(value) {
       if (typeof value === "number" && Math.floor(value) === value || value == null)
         return value;
       throw H.wrapException(H.CastErrorImplementation$(H.Primitives_objectTypeName(value), "int"));
     },
-    propertyTypeCastError: function(value, property) {
-      var t1 = J.getInterceptor$asx(property);
-      throw H.wrapException(H.CastErrorImplementation$(H.Primitives_objectTypeName(value), t1.substring$2(property, 3, t1.get$length(property))));
-    },
-    interceptedTypeCast: function(value, property) {
-      var t1;
-      if (value != null)
-        t1 = typeof value === "object" && J.getInterceptor(value)[property];
-      else
-        t1 = true;
-      if (t1)
-        return value;
-      H.propertyTypeCastError(value, property);
-    },
     throwCyclicInit: function(staticName) {
       throw H.wrapException(new P.CyclicInitializationError("Cyclic initialization for static " + H.S(staticName)));
     },
     buildFunctionType: function(returnType, parameterTypes, optionalParameterTypes) {
       return new H.RuntimeFunctionType(returnType, parameterTypes, optionalParameterTypes, null);
     },
     getDynamicRuntimeType: function() {
       return C.C_DynamicRuntimeType;
     },
     random64: function() {
       return (Math.random() * 0x100000000 >>> 0) + (Math.random() * 0x100000000 >>> 0) * 4294967296;
     },
     getIsolateAffinityTag: function($name) {
       return init.getIsolateTag($name);
     },
-    asyncHelper: function(object, bodyFunctionOrErrorCode, completer) {
-      var future;
-      if (bodyFunctionOrErrorCode === 0) {
-        J.complete$1$x(completer, object);
-        return;
-      } else if (bodyFunctionOrErrorCode === 1) {
-        completer.completeError$2(H.unwrapException(object), H.getTraceFromException(object));
-        return;
-      }
-      if (!!J.getInterceptor(object).$isFuture)
-        future = object;
-      else {
-        future = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null]);
-        future._asyncComplete$1(object);
-      }
-      future.then$2$onError(H._wrapJsFunctionForAsync(bodyFunctionOrErrorCode, 0), new H.asyncHelper_closure(bodyFunctionOrErrorCode));
-      return completer.get$future();
-    },
-    _wrapJsFunctionForAsync: function($function, errorCode) {
-      return new H._wrapJsFunctionForAsync_closure(errorCode, function(errorCode, result) {
-        while (true)
-          try {
-            $function(errorCode, result);
-            break;
-          } catch (error) {
-            result = error;
-            errorCode = 1;
-          }
-      });
-    },
     setRuntimeTypeInfo: function(target, rti) {
-      if (target != null)
-        target.$builtinTypeInfo = rti;
+      target.$builtinTypeInfo = rti;
       return target;
     },
     getRuntimeTypeInfo: function(target) {
       if (target == null)
         return;
       return target.$builtinTypeInfo;
     },
     getRuntimeTypeArguments: function(target, substitutionName) {
       return H.substitute(target["$as" + H.S(substitutionName)], H.getRuntimeTypeInfo(target));
     },
@@ skipping 29 matching lines @@
           buffer._contents = t1 + ", ";
         argument = types[index];
         if (argument != null)
           allDynamic = false;
         t1 = buffer._contents += H.S(H.runtimeTypeToString(argument, onTypeVariable));
       }
       return allDynamic ? "" : "<" + H.S(buffer) + ">";
     },
     substitute: function(substitution, $arguments) {
       if (typeof substitution == "function") {
-        substitution = H.invokeOn(substitution, null, $arguments);
-        if (substitution == null || typeof substitution === "object" && substitution !== null && substitution.constructor === Array)
-          $arguments = substitution;
-        else if (typeof substitution == "function")
-          $arguments = H.invokeOn(substitution, null, $arguments);
+        substitution = substitution.apply(null, $arguments);
+        if (substitution == null)
+          return substitution;
+        if (typeof substitution === "object" && substitution !== null && substitution.constructor === Array)
+          return substitution;
+        if (typeof substitution == "function")
+          return substitution.apply(null, $arguments);
       }
       return $arguments;
     },
     checkSubtype: function(object, isField, checks, asField) {
       var $arguments, interceptor;
       if (object == null)
         return false;
       $arguments = H.getRuntimeTypeInfo(object);
       interceptor = J.getInterceptor(object);
       if (interceptor[isField] == null)
         return false;
       return H.areSubtypes(H.substitute(interceptor[asField], $arguments), checks);
     },
     areSubtypes: function(s, t) {
       var len, i;
       if (s == null || t == null)
         return true;
       len = s.length;
       for (i = 0; i < len; ++i)
         if (!H.isSubtype(s[i], t[i]))
           return false;
       return true;
     },
     computeSignature: function(signature, context, contextName) {
-      return H.invokeOn(signature, context, H.getRuntimeTypeArguments(context, contextName));
+      return signature.apply(context, H.getRuntimeTypeArguments(context, contextName));
     },
     isSubtype: function(s, t) {
       var t1, typeOfS, t2, typeOfT, substitution;
       if (s === t)
         return true;
       if (s == null || t == null)
         return true;
       if ('func' in t)
         return H.isFunctionSubtype(s, t);
       if ('func' in s)
@@ skipping 55 matching lines @@
         sType = s[$name];
         if (!(H.isSubtype(tType, sType) || H.isSubtype(sType, tType)))
           return false;
       }
       return true;
     },
     isFunctionSubtype: function(s, t) {
       var sReturnType, tReturnType, sParameterTypes, tParameterTypes, sOptionalParameterTypes, tOptionalParameterTypes, sParametersLen, tParametersLen, sOptionalParametersLen, tOptionalParametersLen, pos, t1, t2, tPos, sPos;
       if (!('func' in s))
         return false;
-      if ("void" in s) {
-        if (!("void" in t) && "ret" in t)
+      if ("v" in s) {
+        if (!("v" in t) && "ret" in t)
           return false;
-      } else if (!("void" in t)) {
+      } else if (!("v" in t)) {
         sReturnType = s.ret;
         tReturnType = t.ret;
         if (!(H.isSubtype(sReturnType, tReturnType) || H.isSubtype(tReturnType, sReturnType)))
           return false;
       }
       sParameterTypes = s.args;
       tParameterTypes = t.args;
       sOptionalParameterTypes = s.opt;
       tOptionalParameterTypes = t.opt;
       sParametersLen = sParameterTypes != null ? sParameterTypes.length : 0;
@@ skipping 24 matching lines @@
         }
         for (tPos = 0; tPos < tOptionalParametersLen; ++sPos, ++tPos) {
           t1 = sOptionalParameterTypes[sPos];
           t2 = tOptionalParameterTypes[tPos];
           if (!(H.isSubtype(t1, t2) || H.isSubtype(t2, t1)))
             return false;
         }
       }
       return H.areAssignableMaps(s.named, t.named);
     },
-    invokeOn: function($function, receiver, $arguments) {
-      return $function.apply(receiver, $arguments);
-    },
     toStringForNativeObject: function(obj) {
       var t1 = $.getTagFunction;
       return "Instance of " + (t1 == null ? "<Unknown>" : t1.call$1(obj));
     },
     hashCodeForNativeObject: function(object) {
       return H.Primitives_objectHashCode(object);
     },
     defineProperty: function(obj, property, value) {
       Object.defineProperty(obj, property, {value: value, enumerable: false, writable: true, configurable: true});
     },
@@ skipping 127 matching lines @@
       getTag = hooks.getTag;
       getUnknownTag = hooks.getUnknownTag;
       prototypeForTag = hooks.prototypeForTag;
       $.getTagFunction = new H.initHooks_closure(getTag);
       $.alternateTagFunction = new H.initHooks_closure0(getUnknownTag);
       $.prototypeForTagFunction = new H.initHooks_closure1(prototypeForTag);
     },
     applyHooksTransformer: function(transformer, hooks) {
       return transformer(hooks) || hooks;
     },
-    allMatchesInStringUnchecked: function(pattern, string, startIndex) {
-      var result, $length, patternLength, position, endIndex;
-      result = H.setRuntimeTypeInfo([], [P.Match]);
-      $length = J.get$length$asx(string);
-      patternLength = pattern.length;
-      for (; true;) {
-        position = string.indexOf(pattern, startIndex);
-        if (position === -1)
-          break;
-        result.push(new H.StringMatch(position, string, pattern));
-        endIndex = position + patternLength;
-        if (endIndex === $length)
-          break;
-        else
-          startIndex = position === endIndex ? startIndex + 1 : endIndex;
-      }
-      return result;
-    },
     stringContainsUnchecked: function(receiver, other, startIndex) {
       var t1;
       if (typeof other === "string")
         return receiver.indexOf(other, startIndex) >= 0;
       else {
         t1 = J.getInterceptor(other);
         if (!!t1.$isJSSyntaxRegExp) {
           t1 = C.JSString_methods.substring$1(receiver, startIndex);
           return other._nativeRegExp.test(H.checkString(t1));
-        } else
-          return J.get$isNotEmpty$asx(t1.allMatches$1(other, C.JSString_methods.substring$1(receiver, startIndex)));
+        } else {
+          t1 = t1.allMatches$1(other, C.JSString_methods.substring$1(receiver, startIndex));
+          return !t1.get$isEmpty(t1);
+        }
       }
     },
     stringReplaceFirstRE: function(receiver, regexp, replacement, startIndex) {
       var match, t1, start, t2;
       match = regexp._execGlobal$2(receiver, startIndex);
       if (match == null)
         return receiver;
       t1 = match._match;
       start = t1.index;
       t2 = t1.index;
@@ skipping 35 matching lines @@
         index = receiver.indexOf(pattern, startIndex);
         if (index < 0)
           return receiver;
         return H.stringReplaceRangeUnchecked(receiver, index, index + pattern.length, replacement);
       }
       t1 = J.getInterceptor(pattern);
       if (!!t1.$isJSSyntaxRegExp)
         return startIndex === 0 ? receiver.replace(pattern._nativeRegExp, replacement.replace(/\$/g, "$$$$")) : H.stringReplaceFirstRE(receiver, pattern, replacement, startIndex);
       if (pattern == null)
         H.throwExpression(H.argumentErrorValue(pattern));
-      matches = J.get$iterator$ax(t1.allMatches$2(pattern, receiver, startIndex));
+      t1 = t1.allMatches$2(pattern, receiver, startIndex);
+      matches = t1.get$iterator(t1);
       if (!matches.moveNext$0())
         return receiver;
       match = matches.get$current();
-      return C.JSString_methods.replaceRange$3(receiver, J.get$start$x(match), match.get$end(), replacement);
+      return C.JSString_methods.replaceRange$3(receiver, match.get$start(match), match.get$end(), replacement);
     },
     stringReplaceRangeUnchecked: function(receiver, start, end, replacement) {
       var prefix, suffix;
       prefix = receiver.substring(0, start);
       suffix = receiver.substring(end);
       return prefix + replacement + suffix;
     },
     ConstantMapView: {
-      "^": "UnmodifiableMapView;_collection$_map",
+      "^": "UnmodifiableMapView;_map",
       $asUnmodifiableMapView: Isolate.functionThatReturnsNull,
       $asMap: Isolate.functionThatReturnsNull,
       $isMap: 1
     },
     ConstantMap: {
       "^": "Object;",
       get$isEmpty: function(_) {
         return J.$eq$(this.get$length(this), 0);
       },
       get$isNotEmpty: function(_) {
@@ skipping 45 matching lines @@
         t1 = this._arguments;
         argumentCount = t1.length - this._namedArgumentNames.length;
         if (argumentCount === 0)
           return C.List_empty0;
         list = [];
         for (index = 0; index < argumentCount; ++index) {
           if (index >= t1.length)
             return H.ioore(t1, index);
           list.push(t1[index]);
         }
-        list.fixed$length = Array;
-        list.immutable$list = Array;
-        return list;
+        return J.JSArray_markUnmodifiableList(list);
       },
       get$namedArguments: function() {
         var t1, namedArgumentCount, t2, namedArgumentsStartIndex, map, i, t3, t4;
         if (this._kind !== 0)
           return C.Map_empty;
         t1 = this._namedArgumentNames;
         namedArgumentCount = t1.length;
         t2 = this._arguments;
         namedArgumentsStartIndex = t2.length - namedArgumentCount;
         if (namedArgumentCount === 0)
           return C.Map_empty;
-        map = P.LinkedHashMap_LinkedHashMap(null, null, null, P.Symbol, null);
+        map = H.setRuntimeTypeInfo(new H.JsLinkedHashMap(0, null, null, null, null, null, 0), [P.Symbol, null]);
         for (i = 0; i < namedArgumentCount; ++i) {
           if (i >= t1.length)
             return H.ioore(t1, i);
           t3 = t1[i];
           t4 = namedArgumentsStartIndex + i;
           if (t4 < 0 || t4 >= t2.length)
             return H.ioore(t2, t4);
           map.$indexSet(0, new H.Symbol0(t3), t2[t4]);
         }
         return H.setRuntimeTypeInfo(new H.ConstantMapView(map), [P.Symbol, null]);
@@ skipping 15 matching lines @@
           if (data == null)
             return;
           data.fixed$length = Array;
           data = data;
           requiredParametersInfo = data[0];
           optionalParametersInfo = data[1];
           return new H.ReflectionInfo(jsFunction, data, (requiredParametersInfo & 1) === 1, requiredParametersInfo >> 1, optionalParametersInfo >> 1, (optionalParametersInfo & 1) === 1, data[2], null);
         }}
     },
     Primitives_functionNoSuchMethod_closure: {
-      "^": "Closure:30;__js_helper$_box_0,_captured_arguments_1,_captured_namedArgumentList_2",
+      "^": "Closure:42;_box_0,$arguments,namedArgumentList",
       call$2: function($name, argument) {
-        var t1 = this.__js_helper$_box_0;
-        t1._captured_names_1 = t1._captured_names_1 + "$" + H.S($name);
-        this._captured_namedArgumentList_2.push($name);
-        this._captured_arguments_1.push(argument);
-        ++t1._captured_argumentCount_0;
+        var t1 = this._box_0;
+        t1.names = t1.names + "$" + H.S($name);
+        this.namedArgumentList.push($name);
+        this.$arguments.push(argument);
+        ++t1.argumentCount;
       }
     },
     TypeErrorDecoder: {
       "^": "Object;_pattern,_arguments,_argumentsExpr,_expr,_method,_receiver",
       matchTypeError$1: function(message) {
         var match, result, t1;
         match = new RegExp(this._pattern).exec(message);
         if (match == null)
           return;
         result = Object.create(null);
@@ skipping 70 matching lines @@
           var t1, t2;
           t1 = match == null;
           t2 = t1 ? null : match.method;
           return new H.JsNoSuchMethodError(_message, t2, t1 ? null : match.receiver);
         }}
     },
     UnknownJsTypeError: {
       "^": "Error;_message",
       toString$0: function(_) {
         var t1 = this._message;
-        return C.JSString_methods.get$isEmpty(t1) ? "Error" : "Error: " + t1;
+        return t1.length === 0 ? "Error" : "Error: " + t1;
       }
     },
+    ExceptionAndStackTrace: {
+      "^": "Object;dartException,stackTrace<"
+    },
     unwrapException_saveStackTrace: {
-      "^": "Closure:0;_captured_ex_0",
+      "^": "Closure:0;ex",
       call$1: function(error) {
         if (!!J.getInterceptor(error).$isError)
           if (error.$thrownJsError == null)
-            error.$thrownJsError = this._captured_ex_0;
+            error.$thrownJsError = this.ex;
         return error;
       }
     },
     _StackTrace: {
       "^": "Object;_exception,_trace",
       toString$0: function(_) {
         var t1, trace;
         t1 = this._trace;
         if (t1 != null)
           return t1;
         t1 = this._exception;
         trace = t1 !== null && typeof t1 === "object" ? t1.stack : null;
         t1 = trace == null ? "" : trace;
         this._trace = t1;
         return t1;
       }
     },
     invokeClosure_closure: {
-      "^": "Closure:1;_captured_closure_0",
+      "^": "Closure:1;closure",
       call$0: function() {
-        return this._captured_closure_0.call$0();
+        return this.closure.call$0();
       }
     },
     invokeClosure_closure0: {
-      "^": "Closure:1;_captured_closure_1,_captured_arg1_2",
+      "^": "Closure:1;closure,arg1",
       call$0: function() {
-        return this._captured_closure_1.call$1(this._captured_arg1_2);
+        return this.closure.call$1(this.arg1);
       }
     },
     invokeClosure_closure1: {
-      "^": "Closure:1;_captured_closure_3,_captured_arg1_4,_captured_arg2_5",
+      "^": "Closure:1;closure,arg1,arg2",
       call$0: function() {
-        return this._captured_closure_3.call$2(this._captured_arg1_4, this._captured_arg2_5);
+        return this.closure.call$2(this.arg1, this.arg2);
       }
     },
     invokeClosure_closure2: {
-      "^": "Closure:1;_captured_closure_6,_captured_arg1_7,_captured_arg2_8,_captured_arg3_9",
+      "^": "Closure:1;closure,arg1,arg2,arg3",
       call$0: function() {
-        return this._captured_closure_6.call$3(this._captured_arg1_7, this._captured_arg2_8, this._captured_arg3_9);
+        return this.closure.call$3(this.arg1, this.arg2, this.arg3);
       }
     },
     invokeClosure_closure3: {
-      "^": "Closure:1;_captured_closure_10,_captured_arg1_11,_captured_arg2_12,_captured_arg3_13,_captured_arg4_14",
+      "^": "Closure:1;closure,arg1,arg2,arg3,arg4",
       call$0: function() {
-        return this._captured_closure_10.call$4(this._captured_arg1_11, this._captured_arg2_12, this._captured_arg3_13, this._captured_arg4_14);
+        return this.closure.call$4(this.arg1, this.arg2, this.arg3, this.arg4);
       }
     },
     Closure: {
       "^": "Object;",
       toString$0: function(_) {
         return "Closure '" + H.Primitives_objectTypeName(this) + "'";
       },
       get$$call: function() {
         return this;
       },
       $isFunction: 1,
       get$$call: function() {
         return this;
       }
     },
     TearOffClosure: {
       "^": "Closure;"
     },
     StaticClosure: {
       "^": "TearOffClosure;",
       toString$0: function(_) {
-        var $name = this.$name;
+        var $name = this.$static_name;
         if ($name == null)
           return "Closure of unknown static method";
         return "Closure '" + $name + "'";
       }
     },
     BoundClosure: {
       "^": "TearOffClosure;_self,__js_helper$_target,_receiver,_name",
       $eq: function(_, other) {
         if (other == null)
           return false;
@@ skipping 69 matching lines @@
       _extractFunctionTypeObjectFrom$1: function(o) {
         var interceptor = J.getInterceptor(o);
         return "$signature" in interceptor ? interceptor.$signature() : null;
       },
       toRti$0: function() {
         var result, t1, t2, namedRti, keys, i, $name;
         result = {func: "dynafunc"};
         t1 = this.returnType;
         t2 = J.getInterceptor(t1);
         if (!!t2.$isVoidRuntimeType)
-          result.void = true;
+          result.v = true;
         else if (!t2.$isDynamicRuntimeType)
           result.ret = t1.toRti$0();
         t1 = this.parameterTypes;
         if (t1 != null && t1.length !== 0)
           result.args = H.RuntimeFunctionType_listToRti(t1);
         t1 = this.optionalParameterTypes;
         if (t1 != null && t1.length !== 0)
           result.opt = H.RuntimeFunctionType_listToRti(t1);
         t1 = this.namedParameters;
         if (t1 != null) {
@@ skipping 58 matching lines @@
     },
     DynamicRuntimeType: {
       "^": "RuntimeType;",
       toString$0: function(_) {
         return "dynamic";
       },
       toRti$0: function() {
         return;
       }
     },
-    ExceptionAndStackTrace: {
-      "^": "Object;dartException,stackTrace<"
-    },
-    asyncHelper_closure: {
-      "^": "Closure:4;_captured_bodyFunctionOrErrorCode_0",
-      call$2: [function(error, stackTrace) {
-        H._wrapJsFunctionForAsync(this._captured_bodyFunctionOrErrorCode_0, 1).call$1(new H.ExceptionAndStackTrace(error, stackTrace));
-      }, null, null, 4, 0, null, 3, 4, "call"]
-    },
-    _wrapJsFunctionForAsync_closure: {
-      "^": "Closure:0;_captured_errorCode_0,_captured_protected_1",
-      call$1: [function(result) {
-        this._captured_protected_1(this._captured_errorCode_0, result);
-      }, null, null, 2, 0, null, 37, "call"]
-    },
     JsLinkedHashMap: {
       "^": "Object;__js_helper$_length,_strings,_nums,_rest,_first,_last,_modifications",
       get$length: function(_) {
         return this.__js_helper$_length;
       },
       get$isEmpty: function(_) {
         return this.__js_helper$_length === 0;
       },
       get$isNotEmpty: function(_) {
         return !this.get$isEmpty(this);
@@ skipping 47 matching lines @@
         rest = this._rest;
         if (rest == null)
           return;
         bucket = this._getTableEntry$2(rest, this.internalComputeHashCode$1(key));
         index = this.internalFindBucketIndex$2(bucket, key);
         if (index < 0)
           return;
         return bucket[index].get$hashMapCellValue();
       },
       $indexSet: function(_, key, value) {
-        var strings, nums;
+        var strings, nums, rest, hash, bucket, index;
         if (typeof key === "string") {
           strings = this._strings;
           if (strings == null) {
             strings = this._newHashTable$0();
             this._strings = strings;
           }
           this._addHashTableEntry$3(strings, key, value);
         } else if (typeof key === "number" && (key & 0x3ffffff) === key) {
           nums = this._nums;
           if (nums == null) {
             nums = this._newHashTable$0();
             this._nums = nums;
           }
           this._addHashTableEntry$3(nums, key, value);
-        } else
-          this.internalSet$2(key, value);
-      },
-      internalSet$2: function(key, value) {
-        var rest, hash, bucket, index;
-        rest = this._rest;
-        if (rest == null) {
-          rest = this._newHashTable$0();
-          this._rest = rest;
-        }
-        hash = this.internalComputeHashCode$1(key);
-        bucket = this._getTableEntry$2(rest, hash);
-        if (bucket == null)
-          this._setTableEntry$3(rest, hash, [this._newLinkedCell$2(key, value)]);
-        else {
-          index = this.internalFindBucketIndex$2(bucket, key);
-          if (index >= 0)
-            bucket[index].set$hashMapCellValue(value);
-          else
-            bucket.push(this._newLinkedCell$2(key, value));
+        } else {
+          rest = this._rest;
+          if (rest == null) {
+            rest = this._newHashTable$0();
+            this._rest = rest;
+          }
+          hash = this.internalComputeHashCode$1(key);
+          bucket = this._getTableEntry$2(rest, hash);
+          if (bucket == null)
+            this._setTableEntry$3(rest, hash, [this._newLinkedCell$2(key, value)]);
+          else {
+            index = this.internalFindBucketIndex$2(bucket, key);
+            if (index >= 0)
+              bucket[index].set$hashMapCellValue(value);
+            else
+              bucket.push(this._newLinkedCell$2(key, value));
+          }
         }
       },
       remove$1: function(_, key) {
         if (typeof key === "string")
           return this._removeHashTableEntry$2(this._strings, key);
         else if (typeof key === "number" && (key & 0x3ffffff) === key)
           return this._removeHashTableEntry$2(this._nums, key);
         else
           return this.internalRemove$1(key);
       },
@@ skipping 109 matching lines @@
       _containsTableEntry$2: function(table, key) {
         return this._getTableEntry$2(table, key) != null;
       },
       _newHashTable$0: function() {
         var table = Object.create(null);
         this._setTableEntry$3(table, "<non-identifier-key>", table);
         this._deleteTableEntry$2(table, "<non-identifier-key>");
         return table;
       },
       $isInternalMap: 1,
-      $isMap: 1
+      $isMap: 1,
+      static: {JsLinkedHashMap_JsLinkedHashMap$es6: function($K, $V) {
+          return H.setRuntimeTypeInfo(new H.JsLinkedHashMap(0, null, null, null, null, null, 0), [$K, $V]);
+        }}
     },
     JsLinkedHashMap_values_closure: {
-      "^": "Closure:0;__js_helper$_captured_this_0",
+      "^": "Closure:0;$this",
       call$1: [function(each) {
-        return this.__js_helper$_captured_this_0.$index(0, each);
-      }, null, null, 2, 0, null, 32, "call"]
+        return this.$this.$index(0, each);
+      }, null, null, 2, 0, null, 22, "call"]
     },
     LinkedHashMapCell: {
       "^": "Object;hashMapCellKey<,hashMapCellValue@,_next<,_previous<"
     },
     LinkedHashMapKeyIterable: {
       "^": "Iterable;__js_helper$_map",
       get$length: function(_) {
         return this.__js_helper$_map.__js_helper$_length;
       },
       get$isEmpty: function(_) {
@@ skipping 39 matching lines @@
             return false;
           } else {
             this.__js_helper$_current = t1.hashMapCellKey;
             this._cell = t1._next;
             return true;
           }
         }
       }
     },
     initHooks_closure: {
-      "^": "Closure:0;_captured_getTag_0",
+      "^": "Closure:0;getTag",
       call$1: function(o) {
-        return this._captured_getTag_0(o);
+        return this.getTag(o);
       }
     },
     initHooks_closure0: {
-      "^": "Closure:39;_captured_getUnknownTag_1",
+      "^": "Closure:29;getUnknownTag",
       call$2: function(o, tag) {
-        return this._captured_getUnknownTag_1(o, tag);
+        return this.getUnknownTag(o, tag);
       }
     },
     initHooks_closure1: {
-      "^": "Closure:41;_captured_prototypeForTag_2",
+      "^": "Closure:37;prototypeForTag",
       call$1: function(tag) {
-        return this._captured_prototypeForTag_2(tag);
+        return this.prototypeForTag(tag);
       }
     },
     JSSyntaxRegExp: {
       "^": "Object;pattern,_nativeRegExp,_nativeGlobalRegExp,_nativeAnchoredRegExp",
       toString$0: function(_) {
         return "RegExp/" + this.pattern + "/";
       },
       get$_nativeGlobalVersion: function() {
         var t1 = this._nativeGlobalRegExp;
         if (t1 != null)
           return t1;
         t1 = this._nativeRegExp;
         t1 = H.JSSyntaxRegExp_makeNative(this.pattern, t1.multiline, !t1.ignoreCase, true);
         this._nativeGlobalRegExp = t1;
         return t1;
       },
       get$_nativeAnchoredVersion: function() {
         var t1 = this._nativeAnchoredRegExp;
         if (t1 != null)
           return t1;
         t1 = this._nativeRegExp;
         t1 = H.JSSyntaxRegExp_makeNative(this.pattern + "|()", t1.multiline, !t1.ignoreCase, true);
         this._nativeAnchoredRegExp = t1;
         return t1;
       },
       firstMatch$1: function(string) {
         var m = this._nativeRegExp.exec(H.checkString(string));
         if (m == null)
           return;
-        return H._MatchImplementation$(this, m);
+        return new H._MatchImplementation(this, m);
       },
       allMatches$2: function(_, string, start) {
         H.checkString(string);
         H.checkInt(start);
         if (start > string.length)
           throw H.wrapException(P.RangeError$range(start, 0, string.length, null, null));
         return new H._AllMatchesIterable(this, string, start);
       },
       allMatches$1: function($receiver, string) {
         return this.allMatches$2($receiver, string, 0);
       },
       _execGlobal$2: function(string, start) {
         var regexp, match;
         regexp = this.get$_nativeGlobalVersion();
         regexp.lastIndex = start;
         match = regexp.exec(string);
         if (match == null)
           return;
-        return H._MatchImplementation$(this, match);
+        return new H._MatchImplementation(this, match);
       },
       _execAnchored$2: function(string, start) {
         var regexp, match, t1, t2;
         regexp = this.get$_nativeAnchoredVersion();
         regexp.lastIndex = start;
         match = regexp.exec(string);
         if (match == null)
           return;
         t1 = match.length;
         t2 = t1 - 1;
         if (t2 < 0)
           return H.ioore(match, t2);
         if (match[t2] != null)
           return;
         C.JSArray_methods.set$length(match, t2);
-        return H._MatchImplementation$(this, match);
+        return new H._MatchImplementation(this, match);
       },
       matchAsPrefix$2: function(_, string, start) {
         var t1 = J.getInterceptor$n(start);
         if (t1.$lt(start, 0) || t1.$gt(start, string.length))
           throw H.wrapException(P.RangeError$range(start, 0, string.length, null, null));
         return this._execAnchored$2(string, start);
       },
       $isRegExp: 1,
       static: {JSSyntaxRegExp_makeNative: function(source, multiLine, caseSensitive, global) {
           var m, i, g, regexp;
           H.checkString(source);
           m = multiLine ? "m" : "";
           i = caseSensitive ? "" : "i";
           g = global ? "g" : "";
-          regexp = function() {
+          regexp = function(source, modifiers) {
             try {
-              return new RegExp(source, m + i + g);
+              return new RegExp(source, modifiers);
             } catch (e) {
               return e;
             }
-          }();
+          }(source, m + i + g);
           if (regexp instanceof RegExp)
             return regexp;
           throw H.wrapException(new P.FormatException("Illegal RegExp pattern (" + String(regexp) + ")", source, null));
         }}
     },
     _MatchImplementation: {
       "^": "Object;pattern,_match",
       get$start: function(_) {
         return this._match.index;
       },
       get$end: function() {
         var t1, t2;
         t1 = this._match;
         t2 = t1.index;
         if (0 >= t1.length)
           return H.ioore(t1, 0);
         t1 = J.get$length$asx(t1[0]);
         if (typeof t1 !== "number")
           return H.iae(t1);
         return t2 + t1;
       },
       $index: function(_, index) {
         var t1 = this._match;
         if (index >>> 0 !== index || index >= t1.length)
           return H.ioore(t1, index);
         return t1[index];
-      },
-      _MatchImplementation$2: function(pattern, _match) {
-      },
-      static: {_MatchImplementation$: function(pattern, _match) {
-          var t1 = new H._MatchImplementation(pattern, _match);
-          t1._MatchImplementation$2(pattern, _match);
-          return t1;
-        }}
+      }
     },
     _AllMatchesIterable: {
-      "^": "IterableBase;_re,__js_helper$_string,_start",
+      "^": "IterableBase;_re,_string,_start",
       get$iterator: function(_) {
-        return new H._AllMatchesIterator(this._re, this.__js_helper$_string, this._start, null);
+        return new H._AllMatchesIterator(this._re, this._string, this._start, null);
       },
       $asIterableBase: function() {
         return [P.Match];
       },
       $asIterable: function() {
         return [P.Match];
       }
     },
     _AllMatchesIterator: {
-      "^": "Object;_regExp,__js_helper$_string,_nextIndex,__js_helper$_current",
+      "^": "Object;_regExp,_string,_nextIndex,__js_helper$_current",
       get$current: function() {
         return this.__js_helper$_current;
       },
       moveNext$0: function() {
         var t1, t2, match, t3, nextIndex;
-        t1 = this.__js_helper$_string;
+        t1 = this._string;
         if (t1 == null)
           return false;
         t2 = this._nextIndex;
         if (t2 <= t1.length) {
           match = this._regExp._execGlobal$2(t1, t2);
           if (match != null) {
             this.__js_helper$_current = match;
             t1 = match._match;
             t2 = t1.index;
             if (0 >= t1.length)
               return H.ioore(t1, 0);
             t3 = J.get$length$asx(t1[0]);
             if (typeof t3 !== "number")
               return H.iae(t3);
             nextIndex = t2 + t3;
             this._nextIndex = t1.index === nextIndex ? nextIndex + 1 : nextIndex;
             return true;
           }
         }
         this.__js_helper$_current = null;
-        this.__js_helper$_string = null;
+        this._string = null;
         return false;
       }
     },
     StringMatch: {
       "^": "Object;start>,input,pattern",
       get$end: function() {
         return J.$add$ns(this.start, this.pattern.length);
       },
       $index: function(_, g) {
         if (g !== 0)
           H.throwExpression(P.RangeError$value(g, null, null));
         return this.pattern;
       }
+    },
+    _StringAllMatchesIterable: {
+      "^": "Iterable;_input,_pattern,__js_helper$_index",
+      get$iterator: function(_) {
+        return new H._StringAllMatchesIterator(this._input, this._pattern, this.__js_helper$_index, null);
+      },
+      $asIterable: function() {
+        return [P.Match];
+      }
+    },
+    _StringAllMatchesIterator: {
+      "^": "Object;_input,_pattern,__js_helper$_index,__js_helper$_current",
+      moveNext$0: function() {
+        var t1, t2, t3, t4, index, end;
+        t1 = this._pattern;
+        t2 = t1.length;
+        t3 = this._input;
+        t4 = J.getInterceptor$asx(t3);
+        if (J.$gt$n(J.$add$ns(this.__js_helper$_index, t2), t4.get$length(t3))) {
+          this.__js_helper$_current = null;
+          return false;
+        }
+        index = t3.indexOf(t1, this.__js_helper$_index);
+        if (index < 0) {
+          this.__js_helper$_index = J.$add$ns(t4.get$length(t3), 1);
+          this.__js_helper$_current = null;
+          return false;
+        }
+        end = index + t2;
+        this.__js_helper$_current = new H.StringMatch(index, t3, t1);
+        this.__js_helper$_index = end === this.__js_helper$_index ? end + 1 : end;
+        return true;
+      },
+      get$current: function() {
+        return this.__js_helper$_current;
+      }
+    }
+  }], ["async.null_stream_sink", "package:async/src/null_stream_sink.dart",, N, {
+    "^": "",
+    NullStreamSink: {
+      "^": "Object;done,_null_stream_sink$_closed,_addingStream",
+      add$1: function(_, data) {
+        this._checkEventAllowed$0();
+      },
+      addStream$1: function(stream) {
+        var future;
+        this._checkEventAllowed$0();
+        this._addingStream = true;
+        future = stream.listen$1(null).cancel$0();
+        if (future == null) {
+          future = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null]);
+          future._asyncComplete$1(null);
+        }
+        return future.whenComplete$1(new N.NullStreamSink_addStream_closure(this));
+      },
+      _checkEventAllowed$0: function() {
+        if (this._null_stream_sink$_closed)
+          throw H.wrapException(new P.StateError("Cannot add to a closed sink."));
+        if (this._addingStream)
+          throw H.wrapException(new P.StateError("Cannot add to a sink while adding a stream."));
+      },
+      close$0: function(_) {
+        this._null_stream_sink$_closed = true;
+        return this.done;
+      }
+    },
+    NullStreamSink_addStream_closure: {
+      "^": "Closure:1;$this",
+      call$0: [function() {
+        this.$this._addingStream = false;
+      }, null, null, 0, 0, null, "call"]
     }
   }], ["dart._internal", "dart:_internal",, H, {
     "^": "",
     IterableElementError_noElement: function() {
       return new P.StateError("No element");
     },
+    IterableElementError_tooMany: function() {
+      return new P.StateError("Too many elements");
+    },
     IterableElementError_tooFew: function() {
       return new P.StateError("Too few elements");
     },
     CodeUnits: {
-      "^": "UnmodifiableListBase;_string",
+      "^": "UnmodifiableListBase;__internal$_string",
       get$length: function(_) {
-        return this._string.length;
+        return this.__internal$_string.length;
       },
       $index: function(_, i) {
-        return C.JSString_methods.codeUnitAt$1(this._string, i);
+        return C.JSString_methods.codeUnitAt$1(this.__internal$_string, i);
       },
       $asUnmodifiableListBase: function() {
         return [P.$int];
       },
       $asListBase: function() {
         return [P.$int];
       },
       $asList: function() {
         return [P.$int];
       }
@@ skipping 70 matching lines @@
         var $length, value, i;
         $length = this.get$length(this);
         for (value = initialValue, i = 0; i < $length; ++i) {
           value = combine.call$2(value, this.elementAt$1(0, i));
           if ($length !== this.get$length(this))
             throw H.wrapException(new P.ConcurrentModificationError(this));
         }
         return value;
       },
       toList$1$growable: function(_, growable) {
-        var result, t1, i;
-        if (growable) {
-          result = H.setRuntimeTypeInfo([], [H.getRuntimeTypeArgument(this, "ListIterable", 0)]);
-          C.JSArray_methods.set$length(result, this.get$length(this));
-        } else {
-          t1 = Array(this.get$length(this));
-          t1.fixed$length = Array;
-          result = H.setRuntimeTypeInfo(t1, [H.getRuntimeTypeArgument(this, "ListIterable", 0)]);
-        }
+        var result, i, t1;
+        result = H.setRuntimeTypeInfo([], [H.getRuntimeTypeArgument(this, "ListIterable", 0)]);
+        C.JSArray_methods.set$length(result, this.get$length(this));
         for (i = 0; i < this.get$length(this); ++i) {
           t1 = this.elementAt$1(0, i);
           if (i >= result.length)
             return H.ioore(result, i);
           result[i] = t1;
         }
         return result;
       },
       toList$0: function($receiver) {
         return this.toList$1$growable($receiver, true);
       },
       $isEfficientLength: 1
     },
     SubListIterable: {
-      "^": "ListIterable;_iterable,__internal$_start,_endOrLength",
+      "^": "ListIterable;__internal$_iterable,__internal$_start,_endOrLength",
       get$_endIndex: function() {
         var $length, t1, t2;
-        $length = J.get$length$asx(this._iterable);
+        $length = J.get$length$asx(this.__internal$_iterable);
         t1 = this._endOrLength;
         if (t1 != null) {
           if (typeof t1 !== "number")
             return t1.$gt();
           t2 = t1 > $length;
         } else
           t2 = true;
         if (t2)
           return $length;
         return t1;
       },
       get$_startIndex: function() {
         var $length, t1;
-        $length = J.get$length$asx(this._iterable);
+        $length = J.get$length$asx(this.__internal$_iterable);
         t1 = this.__internal$_start;
         if (t1 > $length)
           return $length;
         return t1;
       },
       get$length: function(_) {
         var $length, t1, t2, t3;
-        $length = J.get$length$asx(this._iterable);
+        $length = J.get$length$asx(this.__internal$_iterable);
         t1 = this.__internal$_start;
         if (t1 >= $length)
           return 0;
         t2 = this._endOrLength;
         if (t2 != null) {
           if (typeof t2 !== "number")
             return t2.$ge();
           t3 = t2 >= $length;
         } else
           t3 = true;
         if (t3)
           return $length - t1;
         if (typeof t2 !== "number")
           return t2.$sub();
         return t2 - t1;
       },
       elementAt$1: function(_, index) {
         var realIndex, t1;
         realIndex = this.get$_startIndex() + index;
         if (index >= 0) {
           t1 = this.get$_endIndex();
           if (typeof t1 !== "number")
             return H.iae(t1);
           t1 = realIndex >= t1;
         } else
           t1 = true;
         if (t1)
           throw H.wrapException(P.IndexError$(index, this, "index", null, null));
-        return J.elementAt$1$ax(this._iterable, realIndex);
+        return J.elementAt$1$ax(this.__internal$_iterable, realIndex);
       },
       take$1: function(_, count) {
         var t1, t2, newEnd;
         if (count < 0)
           H.throwExpression(P.RangeError$range(count, 0, null, "count", null));
         t1 = this._endOrLength;
         t2 = this.__internal$_start;
         if (t1 == null)
-          return H.SubListIterable$(this._iterable, t2, t2 + count, H.getTypeArgumentByIndex(this, 0));
+          return H.SubListIterable$(this.__internal$_iterable, t2, t2 + count, H.getTypeArgumentByIndex(this, 0));
         else {
           newEnd = t2 + count;
           if (typeof t1 !== "number")
             return t1.$lt();
           if (t1 < newEnd)
             return this;
-          return H.SubListIterable$(this._iterable, t2, newEnd, H.getTypeArgumentByIndex(this, 0));
+          return H.SubListIterable$(this.__internal$_iterable, t2, newEnd, H.getTypeArgumentByIndex(this, 0));
         }
       },
+      toList$1$growable: function(_, growable) {
+        var start, t1, t2, end, end0, t3, $length, result, i;
+        start = this.__internal$_start;
+        t1 = this.__internal$_iterable;
+        t2 = J.getInterceptor$asx(t1);
+        end = t2.get$length(t1);
+        end0 = this._endOrLength;
+        if (end0 != null) {
+          if (typeof end0 !== "number")
+            return end0.$lt();
+          t3 = end0 < end;
+        } else
+          t3 = false;
+        if (t3)
+          end = end0;
+        if (typeof end !== "number")
+          return end.$sub();
+        $length = end - start;
+        if ($length < 0)
+          $length = 0;
+        result = H.setRuntimeTypeInfo(new Array($length), [H.getTypeArgumentByIndex(this, 0)]);
+        for (i = 0; i < $length; ++i) {
+          t3 = t2.elementAt$1(t1, start + i);
+          if (i >= result.length)
+            return H.ioore(result, i);
+          result[i] = t3;
+          if (t2.get$length(t1) < end)
+            throw H.wrapException(new P.ConcurrentModificationError(this));
+        }
+        return result;
+      },
       SubListIterable$3: function(_iterable, _start, _endOrLength, $E) {
         var t1, t2;
         t1 = this.__internal$_start;
         if (t1 < 0)
           H.throwExpression(P.RangeError$range(t1, 0, null, "start", null));
         t2 = this._endOrLength;
         if (t2 != null) {
           if (typeof t2 !== "number")
             return t2.$lt();
           if (t2 < 0)
             H.throwExpression(P.RangeError$range(t2, 0, null, "end", null));
           if (t1 > t2)
             throw H.wrapException(P.RangeError$range(t1, 0, t2, "start", null));
         }
       },
       static: {SubListIterable$: function(_iterable, _start, _endOrLength, $E) {
           var t1 = H.setRuntimeTypeInfo(new H.SubListIterable(_iterable, _start, _endOrLength), [$E]);
           t1.SubListIterable$3(_iterable, _start, _endOrLength, $E);
           return t1;
         }}
     },
     ListIterator: {
-      "^": "Object;_iterable,__internal$_length,_index,__internal$_current",
+      "^": "Object;__internal$_iterable,__internal$_length,__internal$_index,_current",
       get$current: function() {
-        return this.__internal$_current;
+        return this._current;
       },
       moveNext$0: function() {
         var t1, t2, $length, t3;
-        t1 = this._iterable;
+        t1 = this.__internal$_iterable;
         t2 = J.getInterceptor$asx(t1);
         $length = t2.get$length(t1);
         if (this.__internal$_length !== $length)
           throw H.wrapException(new P.ConcurrentModificationError(t1));
-        t3 = this._index;
+        t3 = this.__internal$_index;
         if (t3 >= $length) {
-          this.__internal$_current = null;
+          this._current = null;
           return false;
         }
-        this.__internal$_current = t2.elementAt$1(t1, t3);
-        ++this._index;
+        this._current = t2.elementAt$1(t1, t3);
+        ++this.__internal$_index;
         return true;
       }
     },
     MappedIterable: {
-      "^": "Iterable;_iterable,_f",
+      "^": "Iterable;__internal$_iterable,_f",
       get$iterator: function(_) {
-        var t1 = new H.MappedIterator(null, J.get$iterator$ax(this._iterable), this._f);
+        var t1 = new H.MappedIterator(null, J.get$iterator$ax(this.__internal$_iterable), this._f);
         t1.$builtinTypeInfo = this.$builtinTypeInfo;
         return t1;
       },
       get$length: function(_) {
-        return J.get$length$asx(this._iterable);
+        return J.get$length$asx(this.__internal$_iterable);
       },
       get$isEmpty: function(_) {
-        return J.get$isEmpty$asx(this._iterable);
+        return J.get$isEmpty$asx(this.__internal$_iterable);
       },
       get$last: function(_) {
-        return this._f$1(J.get$last$ax(this._iterable));
+        return this._f$1(J.get$last$ax(this.__internal$_iterable));
       },
       _f$1: function(arg0) {
         return this._f.call$1(arg0);
       },
       $asIterable: function($S, $T) {
         return [$T];
       },
       static: {MappedIterable_MappedIterable: function(iterable, $function, $S, $T) {
           if (!!J.getInterceptor(iterable).$isEfficientLength)
             return H.setRuntimeTypeInfo(new H.EfficientLengthMappedIterable(iterable, $function), [$S, $T]);
           return H.setRuntimeTypeInfo(new H.MappedIterable(iterable, $function), [$S, $T]);
         }}
     },
     EfficientLengthMappedIterable: {
-      "^": "MappedIterable;_iterable,_f",
+      "^": "MappedIterable;__internal$_iterable,_f",
       $isEfficientLength: 1
     },
     MappedIterator: {
-      "^": "Iterator;__internal$_current,_iterator,_f",
+      "^": "Iterator;_current,_iterator,_f",
       moveNext$0: function() {
         var t1 = this._iterator;
         if (t1.moveNext$0()) {
-          this.__internal$_current = this._f$1(t1.get$current());
+          this._current = this._f$1(t1.get$current());
           return true;
         }
-        this.__internal$_current = null;
+        this._current = null;
         return false;
       },
       get$current: function() {
-        return this.__internal$_current;
+        return this._current;
       },
       _f$1: function(arg0) {
         return this._f.call$1(arg0);
       }
     },
     MappedListIterable: {
       "^": "ListIterable;_source,_f",
       get$length: function(_) {
         return J.get$length$asx(this._source);
       },
       elementAt$1: function(_, index) {
         return this._f$1(J.elementAt$1$ax(this._source, index));
       },
       _f$1: function(arg0) {
         return this._f.call$1(arg0);
       },
       $asListIterable: function($S, $T) {
         return [$T];
       },
       $asIterable: function($S, $T) {
         return [$T];
       },
       $isEfficientLength: 1
     },
     WhereIterable: {
-      "^": "Iterable;_iterable,_f",
+      "^": "Iterable;__internal$_iterable,_f",
       get$iterator: function(_) {
-        var t1 = new H.WhereIterator(J.get$iterator$ax(this._iterable), this._f);
+        var t1 = new H.WhereIterator(J.get$iterator$ax(this.__internal$_iterable), this._f);
         t1.$builtinTypeInfo = this.$builtinTypeInfo;
         return t1;
       }
     },
     WhereIterator: {
       "^": "Iterator;_iterator,_f",
       moveNext$0: function() {
         for (var t1 = this._iterator; t1.moveNext$0();)
           if (this._f$1(t1.get$current()) === true)
             return true;
         return false;
       },
       get$current: function() {
         return this._iterator.get$current();
       },
       _f$1: function(arg0) {
         return this._f.call$1(arg0);
       }
     },
     SkipWhileIterable: {
-      "^": "Iterable;_iterable,_f",
+      "^": "Iterable;__internal$_iterable,_f",
       get$iterator: function(_) {
-        var t1 = new H.SkipWhileIterator(J.get$iterator$ax(this._iterable), this._f, false);
+        var t1 = new H.SkipWhileIterator(J.get$iterator$ax(this.__internal$_iterable), this._f, false);
         t1.$builtinTypeInfo = this.$builtinTypeInfo;
         return t1;
       }
     },
     SkipWhileIterator: {
       "^": "Iterator;_iterator,_f,_hasSkipped",
       moveNext$0: function() {
         if (!this._hasSkipped) {
           this._hasSkipped = true;
           for (var t1 = this._iterator; t1.moveNext$0();)
@@ skipping 90 matching lines @@
   }], ["dart.async", "dart:async",, P, {
     "^": "",
     _AsyncRun__initializeScheduleImmediate: function() {
       var t1, div, span;
       t1 = {};
       if (self.scheduleImmediate != null)
         return P.async__AsyncRun__scheduleImmediateJsOverride$closure();
       if (self.MutationObserver != null && self.document != null) {
         div = self.document.createElement("div");
         span = self.document.createElement("span");
-        t1._captured_storedCallback_0 = null;
+        t1.storedCallback = null;
         new self.MutationObserver(H.convertDartClosureToJS(new P._AsyncRun__initializeScheduleImmediate_internalCallback(t1), 1)).observe(div, {childList: true});
         return new P._AsyncRun__initializeScheduleImmediate_closure(t1, div, span);
       } else if (self.setImmediate != null)
         return P.async__AsyncRun__scheduleImmediateWithSetImmediate$closure();
       return P.async__AsyncRun__scheduleImmediateWithTimer$closure();
     },
     _AsyncRun__scheduleImmediateJsOverride: [function(callback) {
       ++init.globalState.topEventLoop._activeJsAsyncCount;
       self.scheduleImmediate(H.convertDartClosureToJS(new P._AsyncRun__scheduleImmediateJsOverride_internalCallback(callback), 0));
-    }, "call$1", "async__AsyncRun__scheduleImmediateJsOverride$closure", 2, 0, 5],
+    }, "call$1", "async__AsyncRun__scheduleImmediateJsOverride$closure", 2, 0, 4],
     _AsyncRun__scheduleImmediateWithSetImmediate: [function(callback) {
       ++init.globalState.topEventLoop._activeJsAsyncCount;
       self.setImmediate(H.convertDartClosureToJS(new P._AsyncRun__scheduleImmediateWithSetImmediate_internalCallback(callback), 0));
-    }, "call$1", "async__AsyncRun__scheduleImmediateWithSetImmediate$closure", 2, 0, 5],
+    }, "call$1", "async__AsyncRun__scheduleImmediateWithSetImmediate$closure", 2, 0, 4],
     _AsyncRun__scheduleImmediateWithTimer: [function(callback) {
       P.Timer__createTimer(C.Duration_0, callback);
-    }, "call$1", "async__AsyncRun__scheduleImmediateWithTimer$closure", 2, 0, 5],
+    }, "call$1", "async__AsyncRun__scheduleImmediateWithTimer$closure", 2, 0, 4],
+    _asyncHelper: function(object, bodyFunctionOrErrorCode, completer) {
+      if (bodyFunctionOrErrorCode === 0) {
+        J.complete$1$x(completer, object);
+        return;
+      } else if (bodyFunctionOrErrorCode === 1) {
+        completer.completeError$2(H.unwrapException(object), H.getTraceFromException(object));
+        return;
+      }
+      P._awaitOnObject(object, bodyFunctionOrErrorCode);
+      return completer.get$future();
+    },
+    _awaitOnObject: function(object, bodyFunction) {
+      var thenCallback, errorCallback, t1, future;
+      thenCallback = new P._awaitOnObject_closure(bodyFunction);
+      errorCallback = new P._awaitOnObject_closure0(bodyFunction);
+      t1 = J.getInterceptor(object);
+      if (!!t1.$is_Future)
+        object._thenNoZoneRegistration$2(thenCallback, errorCallback);
+      else if (!!t1.$isFuture)
+        object.then$2$onError(thenCallback, errorCallback);
+      else {
+        future = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null]);
+        future._state = 4;
+        future._resultOrListeners = object;
+        future._thenNoZoneRegistration$2(thenCallback, null);
+      }
+    },
+    _wrapJsFunctionForAsync: function($function) {
+      var $protected = function(fn, ERROR) {
+        return function(errorCode, result) {
+          while (true)
+            try {
+              fn(errorCode, result);
+              break;
+            } catch (error) {
+              result = error;
+              errorCode = ERROR;
+            }
+        };
+      }($function, 1);
+      return $.Zone__current.registerBinaryCallback$1(new P._wrapJsFunctionForAsync_closure($protected));
+    },
     _registerErrorHandler: function(errorHandler, zone) {
       var t1 = H.getDynamicRuntimeType();
       t1 = H.buildFunctionType(t1, [t1, t1])._isTest$1(errorHandler);
       if (t1)
         return zone.registerBinaryCallback$1(errorHandler);
       else
         return zone.registerUnaryCallback$1(errorHandler);
     },
     Future_Future$value: function(value, $T) {
       var t1 = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [$T]);
       t1._asyncComplete$1(value);
       return t1;
     },
-    Completer_Completer: function($T) {
-      return H.setRuntimeTypeInfo(new P._AsyncCompleter(H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [$T])), [$T]);
+    Completer_Completer$sync: function($T) {
+      return H.setRuntimeTypeInfo(new P._SyncCompleter(H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [$T])), [$T]);
     },
     _completeWithErrorCallback: function(result, error, stackTrace) {
       var replacement = $.Zone__current.errorCallback$2(error, stackTrace);
       if (replacement != null) {
         error = J.get$error$x(replacement);
         error = error != null ? error : new P.NullThrownError();
         stackTrace = replacement.get$stackTrace();
       }
       result._completeError$2(error, stackTrace);
     },
     _microtaskLoop: function() {
       var t1, t2;
       for (; t1 = $._nextCallback, t1 != null;) {
         $._lastPriorityCallback = null;
-        t2 = t1.get$next();
+        t2 = t1.next;
         $._nextCallback = t2;
         if (t2 == null)
           $._lastCallback = null;
-        $.Zone__current = t1.get$zone();
-        t1.callback$0();
+        t1.callback.call$0();
       }
     },
-    _microtaskLoopEntry: [function() {
+    _startMicrotaskLoop: [function() {
       $._isInCallbackLoop = true;
       try {
         P._microtaskLoop();
       } finally {
-        $.Zone__current = C.C__RootZone;
         $._lastPriorityCallback = null;
         $._isInCallbackLoop = false;
         if ($._nextCallback != null)
-          $.$get$_AsyncRun_scheduleImmediateClosure().call$1(P.async___microtaskLoopEntry$closure());
+          $.$get$_AsyncRun__scheduleImmediateClosure().call$1(P.async___startMicrotaskLoop$closure());
       }
-    }, "call$0", "async___microtaskLoopEntry$closure", 0, 0, 2],
-    _scheduleAsyncCallback: function(newEntry) {
+    }, "call$0", "async___startMicrotaskLoop$closure", 0, 0, 2],
+    _scheduleAsyncCallback: function(callback) {
+      var newEntry = new P._AsyncCallbackEntry(callback, null);
       if ($._nextCallback == null) {
         $._lastCallback = newEntry;
         $._nextCallback = newEntry;
         if (!$._isInCallbackLoop)
-          $.$get$_AsyncRun_scheduleImmediateClosure().call$1(P.async___microtaskLoopEntry$closure());
+          $.$get$_AsyncRun__scheduleImmediateClosure().call$1(P.async___startMicrotaskLoop$closure());
       } else {
         $._lastCallback.next = newEntry;
         $._lastCallback = newEntry;
       }
     },
+    _schedulePriorityAsyncCallback: function(callback) {
+      var t1, entry, t2;
+      t1 = $._nextCallback;
+      if (t1 == null) {
+        P._scheduleAsyncCallback(callback);
+        $._lastPriorityCallback = $._lastCallback;
+        return;
+      }
+      entry = new P._AsyncCallbackEntry(callback, null);
+      t2 = $._lastPriorityCallback;
+      if (t2 == null) {
+        entry.next = t1;
+        $._lastPriorityCallback = entry;
+        $._nextCallback = entry;
+      } else {
+        entry.next = t2.next;
+        t2.next = entry;
+        $._lastPriorityCallback = entry;
+        if (entry.next == null)
+          $._lastCallback = entry;
+      }
+    },
     scheduleMicrotask: function(callback) {
       var currentZone, t1;
       currentZone = $.Zone__current;
       if (C.C__RootZone === currentZone) {
         P._rootScheduleMicrotask(null, null, C.C__RootZone, callback);
         return;
       }
       if (C.C__RootZone === currentZone.get$_scheduleMicrotask().zone)
         t1 = C.C__RootZone.get$errorZone() === currentZone.get$errorZone();
       else
         t1 = false;
       if (t1) {
         P._rootScheduleMicrotask(null, null, currentZone, currentZone.registerCallback$1(callback));
         return;
       }
       t1 = $.Zone__current;
       t1.scheduleMicrotask$1(t1.bindCallback$2$runGuarded(callback, true));
     },
     StreamIterator_StreamIterator: function(stream, $T) {
       var t1, t2, t3;
       t1 = H.setRuntimeTypeInfo(new P._StreamIteratorImpl(null, null, null, 0), [$T]);
       t2 = t1.get$_async$_onData();
       t3 = t1.get$_onError();
       t1._subscription = stream.listen$4$cancelOnError$onDone$onError(t2, true, t1.get$_onDone(), t3);
       return t1;
     },
     StreamController_StreamController: function(onCancel, onListen, onPause, onResume, sync, $T) {
-      return sync ? H.setRuntimeTypeInfo(new P._SyncStreamController(null, 0, null, onListen, onPause, onResume, onCancel), [$T]) : H.setRuntimeTypeInfo(new P._AsyncStreamController(null, 0, null, onListen, onPause, onResume, onCancel), [$T]);
+      return H.setRuntimeTypeInfo(new P._SyncStreamController(null, 0, null, onListen, onPause, onResume, onCancel), [$T]);
     },
     _runGuarded: function(notificationHandler) {
       var result, e, s, exception, t1;
       if (notificationHandler == null)
         return;
       try {
         result = notificationHandler.call$0();
         if (!!J.getInterceptor(result).$isFuture)
           return result;
         return;
       } catch (exception) {
         t1 = H.unwrapException(exception);
         e = t1;
         s = H.getTraceFromException(exception);
         $.Zone__current.handleUncaughtError$2(e, s);
       }
     },
-    _AddStreamState_makeErrorHandler: function(controller) {
-      return new P._AddStreamState_makeErrorHandler_closure(controller);
-    },
+    _nullDataHandler: [function(value) {
+    }, "call$1", "async___nullDataHandler$closure", 2, 0, 51, 6],
     _nullErrorHandler: [function(error, stackTrace) {
       $.Zone__current.handleUncaughtError$2(error, stackTrace);
     }, function(error) {
       return P._nullErrorHandler(error, null);
-    }, "call$2", "call$1", "async___nullErrorHandler$closure", 2, 2, 8, 5, 3, 4],
+    }, "call$2", "call$1", "async___nullErrorHandler$closure", 2, 2, 6, 5, 1, 2],
     _nullDoneHandler: [function() {
     }, "call$0", "async___nullDoneHandler$closure", 0, 0, 2],
     _runUserCode: function(userCode, onSuccess, onError) {
       var e, s, replacement, error, stackTrace, exception, t1, error0;
       try {
         onSuccess.call$1(userCode.call$0());
       } catch (exception) {
         t1 = H.unwrapException(exception);
         e = t1;
         s = H.getTraceFromException(exception);
@@ skipping 25 matching lines @@
       else
         future._complete$1(value);
     },
     _addErrorWithReplacement: function(sink, error, stackTrace) {
       var replacement = $.Zone__current.errorCallback$2(error, stackTrace);
       if (replacement != null) {
         error = J.get$error$x(replacement);
         error = error != null ? error : new P.NullThrownError();
         stackTrace = replacement.get$stackTrace();
       }
-      sink._addError$2(error, stackTrace);
+      sink._async$_addError$2(error, stackTrace);
     },
     Timer_Timer: function(duration, callback) {
       var t1;
       if (J.$eq$($.Zone__current, C.C__RootZone))
         return $.Zone__current.createTimer$2(duration, callback);
       t1 = $.Zone__current;
       return t1.createTimer$2(duration, t1.bindCallback$2$runGuarded(callback, true));
     },
+    Timer_Timer$periodic: function(duration, callback) {
+      var t1;
+      if (J.$eq$($.Zone__current, C.C__RootZone))
+        return $.Zone__current.createPeriodicTimer$2(duration, callback);
+      t1 = $.Zone__current;
+      return t1.createPeriodicTimer$2(duration, t1.bindUnaryCallback$2$runGuarded(callback, true));
+    },
     Timer__createTimer: function(duration, callback) {
       var milliseconds = duration.get$inMilliseconds();
       return H.TimerImpl$(milliseconds < 0 ? 0 : milliseconds, callback);
     },
     Timer__createPeriodicTimer: function(duration, callback) {
       var milliseconds = duration.get$inMilliseconds();
       return H.TimerImpl$periodic(milliseconds < 0 ? 0 : milliseconds, callback);
     },
-    Zone__enter: function(zone) {
-      var previous = $.Zone__current;
-      $.Zone__current = zone;
-      return previous;
-    },
     _parentDelegate: function(zone) {
       if (zone.get$parent(zone) == null)
         return;
       return zone.get$parent(zone).get$_delegate();
     },
     _rootHandleUncaughtError: [function($self, $parent, zone, error, stackTrace) {
-      var entry, t1, t2;
-      entry = new P._AsyncCallbackEntry(new P._rootHandleUncaughtError_closure(error, stackTrace), C.C__RootZone, null);
-      t1 = $._nextCallback;
-      if (t1 == null) {
-        P._scheduleAsyncCallback(entry);
-        $._lastPriorityCallback = $._lastCallback;
-      } else {
-        t2 = $._lastPriorityCallback;
-        if (t2 == null) {
-          entry.next = t1;
-          $._lastPriorityCallback = entry;
-          $._nextCallback = entry;
-        } else {
-          entry.next = t2.next;
-          t2.next = entry;
-          $._lastPriorityCallback = entry;
-          if (entry.next == null)
-            $._lastCallback = entry;
-        }
-      }
-    }, "call$5", "async___rootHandleUncaughtError$closure", 10, 0, 53, 0, 1, 2, 3, 4],
+      var t1 = {};
+      t1.error = error;
+      P._schedulePriorityAsyncCallback(new P._rootHandleUncaughtError_closure(t1, stackTrace));
+    }, "call$5", "async___rootHandleUncaughtError$closure", 10, 0, 52, 0, 3, 4, 1, 2],
     _rootRun: [function($self, $parent, zone, f) {
-      var old, t1;
+      var old, previous, t1;
       if (J.$eq$($.Zone__current, zone))
         return f.call$0();
-      old = P.Zone__enter(zone);
+      previous = $.Zone__current;
+      $.Zone__current = zone;
+      old = previous;
       try {
         t1 = f.call$0();
         return t1;
       } finally {
         $.Zone__current = old;
       }
-    }, "call$4", "async___rootRun$closure", 8, 0, 54, 0, 1, 2, 7],
+    }, "call$4", "async___rootRun$closure", 8, 0, 53, 0, 3, 4, 8],
     _rootRunUnary: [function($self, $parent, zone, f, arg) {
-      var old, t1;
+      var old, previous, t1;
       if (J.$eq$($.Zone__current, zone))
         return f.call$1(arg);
-      old = P.Zone__enter(zone);
+      previous = $.Zone__current;
+      $.Zone__current = zone;
+      old = previous;
       try {
         t1 = f.call$1(arg);
         return t1;
       } finally {
         $.Zone__current = old;
       }
-    }, "call$5", "async___rootRunUnary$closure", 10, 0, 55, 0, 1, 2, 7, 9],
+    }, "call$5", "async___rootRunUnary$closure", 10, 0, 54, 0, 3, 4, 8, 13],
     _rootRunBinary: [function($self, $parent, zone, f, arg1, arg2) {
-      var old, t1;
+      var old, previous, t1;
       if (J.$eq$($.Zone__current, zone))
         return f.call$2(arg1, arg2);
-      old = P.Zone__enter(zone);
+      previous = $.Zone__current;
+      $.Zone__current = zone;
+      old = previous;
       try {
         t1 = f.call$2(arg1, arg2);
         return t1;
       } finally {
         $.Zone__current = old;
       }
-    }, "call$6", "async___rootRunBinary$closure", 12, 0, 56, 0, 1, 2, 7, 22, 18],
+    }, "call$6", "async___rootRunBinary$closure", 12, 0, 55, 0, 3, 4, 8, 20, 21],
     _rootRegisterCallback: [function($self, $parent, zone, f) {
       return f;
-    }, "call$4", "async___rootRegisterCallback$closure", 8, 0, 57, 0, 1, 2, 7],
+    }, "call$4", "async___rootRegisterCallback$closure", 8, 0, 56, 0, 3, 4, 8],
     _rootRegisterUnaryCallback: [function($self, $parent, zone, f) {
       return f;
-    }, "call$4", "async___rootRegisterUnaryCallback$closure", 8, 0, 58, 0, 1, 2, 7],
+    }, "call$4", "async___rootRegisterUnaryCallback$closure", 8, 0, 57, 0, 3, 4, 8],
     _rootRegisterBinaryCallback: [function($self, $parent, zone, f) {
       return f;
-    }, "call$4", "async___rootRegisterBinaryCallback$closure", 8, 0, 59, 0, 1, 2, 7],
+    }, "call$4", "async___rootRegisterBinaryCallback$closure", 8, 0, 58, 0, 3, 4, 8],
     _rootErrorCallback: [function($self, $parent, zone, error, stackTrace) {
       return;
-    }, "call$5", "async___rootErrorCallback$closure", 10, 0, 60, 0, 1, 2, 3, 4],
+    }, "call$5", "async___rootErrorCallback$closure", 10, 0, 59, 0, 3, 4, 1, 2],
     _rootScheduleMicrotask: [function($self, $parent, zone, f) {
       var t1 = C.C__RootZone !== zone;
-      if (t1) {
+      if (t1)
         f = zone.bindCallback$2$runGuarded(f, !(!t1 || C.C__RootZone.get$errorZone() === zone.get$errorZone()));
-        zone = C.C__RootZone;
-      }
-      P._scheduleAsyncCallback(new P._AsyncCallbackEntry(f, zone, null));
-    }, "call$4", "async___rootScheduleMicrotask$closure", 8, 0, 61, 0, 1, 2, 7],
+      P._scheduleAsyncCallback(f);
+    }, "call$4", "async___rootScheduleMicrotask$closure", 8, 0, 60, 0, 3, 4, 8],
     _rootCreateTimer: [function($self, $parent, zone, duration, callback) {
       return P.Timer__createTimer(duration, C.C__RootZone !== zone ? zone.bindCallback$1(callback) : callback);
-    }, "call$5", "async___rootCreateTimer$closure", 10, 0, 62, 0, 1, 2, 19, 14],
+    }, "call$5", "async___rootCreateTimer$closure", 10, 0, 61, 0, 3, 4, 18, 16],
     _rootCreatePeriodicTimer: [function($self, $parent, zone, duration, callback) {
       return P.Timer__createPeriodicTimer(duration, C.C__RootZone !== zone ? zone.bindUnaryCallback$1(callback) : callback);
-    }, "call$5", "async___rootCreatePeriodicTimer$closure", 10, 0, 63, 0, 1, 2, 19, 14],
+    }, "call$5", "async___rootCreatePeriodicTimer$closure", 10, 0, 62, 0, 3, 4, 18, 16],
     _rootPrint: [function($self, $parent, zone, line) {
       H.printString(H.S(line));
-    }, "call$4", "async___rootPrint$closure", 8, 0, 64, 0, 1, 2, 10],
+    }, "call$4", "async___rootPrint$closure", 8, 0, 63, 0, 3, 4, 10],
     _printToZone: [function(line) {
       J.print$1$x($.Zone__current, line);
-    }, "call$1", "async___printToZone$closure", 2, 0, 6],
+    }, "call$1", "async___printToZone$closure", 2, 0, 7],
     _rootFork: [function($self, $parent, zone, specification, zoneValues) {
       var valueMap, t1;
       $.printToZone = P.async___printToZone$closure();
       if (specification == null)
         specification = C._ZoneSpecification_ALf;
       else if (!(specification instanceof P._ZoneSpecification))
         throw H.wrapException(P.ArgumentError$("ZoneSpecifications must be instantiated with the provided constructor."));
       if (zoneValues == null)
-        valueMap = zone instanceof P._Zone ? zone.get$_map() : P.HashMap_HashMap(null, null, null, null, null);
+        valueMap = zone instanceof P._Zone ? zone.get$_async$_map() : P.HashMap_HashMap(null, null, null, null, null);
       else
         valueMap = P.HashMap_HashMap$from(zoneValues, null, null);
       t1 = new P._CustomZone(null, null, null, null, null, null, null, null, null, null, null, null, null, null, zone, valueMap);
       specification.get$run();
       t1._run = zone.get$_run();
       specification.get$runUnary();
       t1._runUnary = zone.get$_runUnary();
       specification.get$runBinary();
       t1._runBinary = zone.get$_runBinary();
       specification.get$registerCallback();
       t1._registerCallback = zone.get$_registerCallback();
       specification.get$registerUnaryCallback();
       t1._registerUnaryCallback = zone.get$_registerUnaryCallback();
       specification.get$registerBinaryCallback();
       t1._registerBinaryCallback = zone.get$_registerBinaryCallback();
       specification.get$errorCallback();
       t1._errorCallback = zone.get$_errorCallback();
       specification.get$scheduleMicrotask();
       t1._scheduleMicrotask = zone.get$_scheduleMicrotask();
       specification.get$createTimer();
       t1._createTimer = zone.get$_createTimer();
       specification.get$createPeriodicTimer();
       t1._createPeriodicTimer = zone.get$_createPeriodicTimer();
       J.get$print$x(specification);
       t1._print = zone.get$_print();
       specification.get$fork();
       t1._fork = zone.get$_fork();
       t1._handleUncaughtError = specification.get$handleUncaughtError() != null ? new P._ZoneFunction(t1, specification.get$handleUncaughtError()) : zone.get$_handleUncaughtError();
       return t1;
-    }, "call$5", "async___rootFork$closure", 10, 0, 65, 0, 1, 2, 42, 30],
+    }, "call$5", "async___rootFork$closure", 10, 0, 64, 0, 3, 4, 30, 31],
     runZoned: function(body, onError, zoneSpecification, zoneValues) {
       var errorHandler, zone;
       errorHandler = new P.runZoned_closure(onError);
       zoneSpecification = new P._ZoneSpecification(errorHandler, null, null, null, null, null, null, null, null, null, null, null, null);
       zone = $.Zone__current.fork$2$specification$zoneValues(zoneSpecification, zoneValues);
       return zone.runGuarded$1(body);
     },
     _AsyncRun__initializeScheduleImmediate_internalCallback: {
-      "^": "Closure:0;_async$_box_0",
+      "^": "Closure:0;_box_0",
       call$1: [function(_) {
         var t1, f;
-        H.leaveJsAsync();
-        t1 = this._async$_box_0;
-        f = t1._captured_storedCallback_0;
-        t1._captured_storedCallback_0 = null;
+        --init.globalState.topEventLoop._activeJsAsyncCount;
+        t1 = this._box_0;
+        f = t1.storedCallback;
+        t1.storedCallback = null;
         f.call$0();
-      }, null, null, 2, 0, null, 11, "call"]
+      }, null, null, 2, 0, null, 9, "call"]
     },
     _AsyncRun__initializeScheduleImmediate_closure: {
-      "^": "Closure:66;_async$_box_0,_captured_div_1,_captured_span_2",
+      "^": "Closure:40;_box_0,div,span",
       call$1: function(callback) {
         var t1, t2;
         ++init.globalState.topEventLoop._activeJsAsyncCount;
-        this._async$_box_0._captured_storedCallback_0 = callback;
-        t1 = this._captured_div_1;
-        t2 = this._captured_span_2;
+        this._box_0.storedCallback = callback;
+        t1 = this.div;
+        t2 = this.span;
         t1.firstChild ? t1.removeChild(t2) : t1.appendChild(t2);
       }
     },
     _AsyncRun__scheduleImmediateJsOverride_internalCallback: {
-      "^": "Closure:1;_captured_callback_0",
+      "^": "Closure:1;callback",
       call$0: [function() {
-        H.leaveJsAsync();
-        this._captured_callback_0.call$0();
+        --init.globalState.topEventLoop._activeJsAsyncCount;
+        this.callback.call$0();
       }, null, null, 0, 0, null, "call"]
     },
     _AsyncRun__scheduleImmediateWithSetImmediate_internalCallback: {
-      "^": "Closure:1;_captured_callback_0",
+      "^": "Closure:1;callback",
       call$0: [function() {
-        H.leaveJsAsync();
-        this._captured_callback_0.call$0();
+        --init.globalState.topEventLoop._activeJsAsyncCount;
+        this.callback.call$0();
       }, null, null, 0, 0, null, "call"]
     },
-    _UncaughtAsyncError: {
-      "^": "AsyncError;error,stackTrace",
-      toString$0: function(_) {
-        var result, t1;
-        result = "Uncaught Error: " + H.S(this.error);
-        t1 = this.stackTrace;
-        return t1 != null ? result + ("\nStack Trace:\n" + H.S(t1)) : result;
-      },
-      static: {_UncaughtAsyncError__getBestStackTrace: function(error, stackTrace) {
-          if (stackTrace != null)
-            return stackTrace;
-          if (!!J.getInterceptor(error).$isError)
-            return error.get$stackTrace();
-          return;
-        }}
+    _awaitOnObject_closure: {
+      "^": "Closure:0;bodyFunction",
+      call$1: [function(result) {
+        return this.bodyFunction.call$2(0, result);
+      }, null, null, 2, 0, null, 14, "call"]
+    },
+    _awaitOnObject_closure0: {
+      "^": "Closure:5;bodyFunction",
+      call$2: [function(error, stackTrace) {
+        this.bodyFunction.call$2(1, new H.ExceptionAndStackTrace(error, stackTrace));
+      }, null, null, 4, 0, null, 1, 2, "call"]
+    },
+    _wrapJsFunctionForAsync_closure: {
+      "^": "Closure:65;$protected",
+      call$2: [function(errorCode, result) {
+        this.$protected(errorCode, result);
+      }, null, null, 4, 0, null, 45, 14, "call"]
     },
     Future: {
       "^": "Object;"
     },
     _Completer: {
       "^": "Object;future<",
       completeError$2: function(error, stackTrace) {
         var replacement;
         error = error != null ? error : new P.NullThrownError();
         if (this.future._state !== 0)
           throw H.wrapException(new P.StateError("Future already completed"));
         replacement = $.Zone__current.errorCallback$2(error, stackTrace);
         if (replacement != null) {
           error = J.get$error$x(replacement);
           error = error != null ? error : new P.NullThrownError();
           stackTrace = replacement.get$stackTrace();
         }
         this._completeError$2(error, stackTrace);
+      },
+      completeError$1: function(error) {
+        return this.completeError$2(error, null);
       }
     },
     _AsyncCompleter: {
       "^": "_Completer;future",
       complete$1: function(_, value) {
         var t1 = this.future;
         if (t1._state !== 0)
           throw H.wrapException(new P.StateError("Future already completed"));
         t1._asyncComplete$1(value);
       },
       complete$0: function($receiver) {
         return this.complete$1($receiver, null);
       },
       _completeError$2: function(error, stackTrace) {
         this.future._asyncCompleteError$2(error, stackTrace);
       }
     },
+    _SyncCompleter: {
+      "^": "_Completer;future",
+      complete$1: [function(_, value) {
+        var t1 = this.future;
+        if (t1._state !== 0)
+          throw H.wrapException(new P.StateError("Future already completed"));
+        t1._complete$1(value);
+      }, function($receiver) {
+        return this.complete$1($receiver, null);
+      }, "complete$0", "call$1", "call$0", "get$complete", 0, 2, 46, 5, 6],
+      _completeError$2: function(error, stackTrace) {
+        this.future._completeError$2(error, stackTrace);
+      }
+    },
     _FutureListener: {
       "^": "Object;_nextListener@,result>,state,callback,errorCallback<",
       get$_zone: function() {
         return this.result.get$_zone();
       },
       get$handlesValue: function() {
         return (this.state & 1) !== 0;
       },
       get$hasErrorTest: function() {
         return this.state === 6;
       },
       get$handlesComplete: function() {
         return this.state === 8;
       },
       get$_onValue: function() {
         return this.callback;
       },
       get$_onError: function() {
         return this.errorCallback;
       },
       get$_errorTest: function() {
         return this.callback;
       },
       get$_whenCompleteAction: function() {
         return this.callback;
       },
-      callback$0: function() {
-        return this.callback.call$0();
-      },
       errorCallback$2: function(arg0, arg1) {
         return this.errorCallback.call$2(arg0, arg1);
       }
     },
     _Future: {
       "^": "Object;_state,_zone<,_resultOrListeners",
       get$_hasError: function() {
         return this._state === 8;
       },
       set$_isChained: function(value) {
-        if (value)
-          this._state = 2;
-        else
-          this._state = 0;
+        this._state = 2;
       },
       then$2$onError: function(f, onError) {
-        var result, t1;
-        result = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null]);
-        t1 = result._zone;
-        if (t1 !== C.C__RootZone) {
-          f = t1.registerUnaryCallback$1(f);
+        var currentZone = $.Zone__current;
+        if (currentZone !== C.C__RootZone) {
+          f = currentZone.registerUnaryCallback$1(f);
           if (onError != null)
-            onError = P._registerErrorHandler(onError, t1);
+            onError = P._registerErrorHandler(onError, currentZone);
         }
-        this._addListener$1(new P._FutureListener(null, result, onError == null ? 1 : 3, f, onError));
-        return result;
+        return this._thenNoZoneRegistration$2(f, onError);
       },
       then$1: function(f) {
         return this.then$2$onError(f, null);
       },
+      _thenNoZoneRegistration$2: function(f, onError) {
+        var result = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null]);
+        this._addListener$1(new P._FutureListener(null, result, onError == null ? 1 : 3, f, onError));
+        return result;
+      },
       whenComplete$1: function(action) {
         var t1, result;
         t1 = $.Zone__current;
         result = new P._Future(0, t1, null);
         result.$builtinTypeInfo = this.$builtinTypeInfo;
         this._addListener$1(new P._FutureListener(null, result, 8, t1 !== C.C__RootZone ? t1.registerCallback$1(action) : action, null));
         return result;
       },
       _markPendingCompletion$0: function() {
         if (this._state !== 0)
           throw H.wrapException(new P.StateError("Future already completed"));
         this._state = 1;
       },
-      get$_value: function() {
+      get$_async$_value: function() {
         return this._resultOrListeners;
       },
       get$_error: function() {
         return this._resultOrListeners;
       },
       _setValue$1: function(value) {
         this._state = 4;
         this._resultOrListeners = value;
       },
       _setErrorObject$1: function(error) {
         this._state = 8;
         this._resultOrListeners = error;
       },
       _setError$2: function(error, stackTrace) {
-        this._setErrorObject$1(new P.AsyncError(error, stackTrace));
+        this._state = 8;
+        this._resultOrListeners = new P.AsyncError(error, stackTrace);
       },
       _addListener$1: function(listener) {
         if (this._state >= 4)
           this._zone.scheduleMicrotask$1(new P._Future__addListener_closure(this, listener));
         else {
           listener._nextListener = this._resultOrListeners;
           this._resultOrListeners = listener;
         }
       },
       _removeListeners$0: function() {
         var current, prev, next;
         current = this._resultOrListeners;
         this._resultOrListeners = null;
         for (prev = null; current != null; prev = current, current = next) {
           next = current.get$_nextListener();
           current.set$_nextListener(prev);
         }
         return prev;
       },
       _complete$1: function(value) {
-        var t1, listeners;
-        t1 = J.getInterceptor(value);
-        if (!!t1.$isFuture)
-          if (!!t1.$is_Future)
-            P._Future__chainCoreFuture(value, this);
-          else
-            P._Future__chainForeignFuture(value, this);
+        var listeners;
+        if (!!J.getInterceptor(value).$isFuture)
+          P._Future__chainCoreFuture(value, this);
         else {
           listeners = this._removeListeners$0();
-          this._setValue$1(value);
+          this._state = 4;
+          this._resultOrListeners = value;
           P._Future__propagateToListeners(this, listeners);
         }
       },
       _completeWithValue$1: function(value) {
         var listeners = this._removeListeners$0();
-        this._setValue$1(value);
+        this._state = 4;
+        this._resultOrListeners = value;
         P._Future__propagateToListeners(this, listeners);
       },
       _completeError$2: [function(error, stackTrace) {
         var listeners = this._removeListeners$0();
-        this._setErrorObject$1(new P.AsyncError(error, stackTrace));
+        this._state = 8;
+        this._resultOrListeners = new P.AsyncError(error, stackTrace);
         P._Future__propagateToListeners(this, listeners);
       }, function(error) {
         return this._completeError$2(error, null);
-      }, "_completeError$1", "call$2", "call$1", "get$_completeError", 2, 2, 8, 5, 3, 4],
+      }, "_completeError$1", "call$2", "call$1", "get$_completeError", 2, 2, 6, 5, 1, 2],
       _asyncComplete$1: function(value) {
         var t1;
         if (value == null)
           ;
-        else {
-          t1 = J.getInterceptor(value);
-          if (!!t1.$isFuture) {
-            if (!!t1.$is_Future) {
-              t1 = value._state;
-              if (t1 >= 4 && t1 === 8) {
-                this._markPendingCompletion$0();
-                this._zone.scheduleMicrotask$1(new P._Future__asyncComplete_closure(this, value));
-              } else
-                P._Future__chainCoreFuture(value, this);
-            } else
-              P._Future__chainForeignFuture(value, this);
-            return;
-          }
+        else if (!!J.getInterceptor(value).$isFuture) {
+          t1 = value._state;
+          if (t1 >= 4 && t1 === 8) {
+            this._markPendingCompletion$0();
+            this._zone.scheduleMicrotask$1(new P._Future__asyncComplete_closure(this, value));
+          } else
+            P._Future__chainCoreFuture(value, this);
+          return;
         }
         this._markPendingCompletion$0();
         this._zone.scheduleMicrotask$1(new P._Future__asyncComplete_closure0(this, value));
       },
       _asyncCompleteError$2: function(error, stackTrace) {
         this._markPendingCompletion$0();
         this._zone.scheduleMicrotask$1(new P._Future__asyncCompleteError_closure(this, error, stackTrace));
       },
       $isFuture: 1,
       static: {_Future__chainForeignFuture: function(source, target) {
@@ skipping 11 matching lines @@
           var listener;
           target.set$_isChained(true);
           listener = new P._FutureListener(null, target, 0, null, null);
           if (source._state >= 4)
             P._Future__propagateToListeners(source, listener);
           else
             source._addListener$1(listener);
         }, _Future__propagateToListeners: function(source, listeners) {
           var t1, t2, t3, hasError, asyncError, listeners0, sourceValue, zone, oldZone, chainSource, result;
           t1 = {};
-          t1._captured_source_4 = source;
+          t1.source = source;
           for (t2 = source; true;) {
             t3 = {};
             hasError = t2.get$_hasError();
             if (listeners == null) {
               if (hasError) {
-                asyncError = t1._captured_source_4.get$_error();
-                t1._captured_source_4.get$_zone().handleUncaughtError$2(J.get$error$x(asyncError), asyncError.get$stackTrace());
+                asyncError = t1.source.get$_error();
+                t1.source.get$_zone().handleUncaughtError$2(J.get$error$x(asyncError), asyncError.get$stackTrace());
               }
               return;
             }
             for (; listeners.get$_nextListener() != null; listeners = listeners0) {
               listeners0 = listeners.get$_nextListener();
               listeners.set$_nextListener(null);
-              P._Future__propagateToListeners(t1._captured_source_4, listeners);
+              P._Future__propagateToListeners(t1.source, listeners);
             }
-            t3._captured_listenerHasValue_1 = true;
-            sourceValue = hasError ? null : t1._captured_source_4.get$_value();
-            t3._captured_listenerValueOrError_2 = sourceValue;
-            t3._captured_isPropagationAborted_3 = false;
+            t3.listenerHasValue = true;
+            sourceValue = hasError ? null : t1.source.get$_async$_value();
+            t3.listenerValueOrError = sourceValue;
+            t3.isPropagationAborted = false;
             t2 = !hasError;
             if (!t2 || listeners.get$handlesValue() || listeners.get$handlesComplete()) {
               zone = listeners.get$_zone();
-              if (hasError && !t1._captured_source_4.get$_zone().inSameErrorZone$1(zone)) {
-                asyncError = t1._captured_source_4.get$_error();
-                t1._captured_source_4.get$_zone().handleUncaughtError$2(J.get$error$x(asyncError), asyncError.get$stackTrace());
+              if (hasError && !t1.source.get$_zone().inSameErrorZone$1(zone)) {
+                asyncError = t1.source.get$_error();
+                t1.source.get$_zone().handleUncaughtError$2(J.get$error$x(asyncError), asyncError.get$stackTrace());
                 return;
               }
               oldZone = $.Zone__current;
               if (oldZone == null ? zone != null : oldZone !== zone)
                 $.Zone__current = zone;
               else
                 oldZone = null;
               if (t2) {
                 if (listeners.get$handlesValue())
-                  t3._captured_listenerHasValue_1 = new P._Future__propagateToListeners_handleValueCallback(t3, listeners, sourceValue, zone).call$0();
+                  t3.listenerHasValue = new P._Future__propagateToListeners_handleValueCallback(t3, listeners, sourceValue, zone).call$0();
               } else
                 new P._Future__propagateToListeners_handleError(t1, t3, listeners, zone).call$0();
               if (listeners.get$handlesComplete())
                 new P._Future__propagateToListeners_handleWhenCompleteCallback(t1, t3, hasError, listeners, zone).call$0();
               if (oldZone != null)
                 $.Zone__current = oldZone;
-              if (t3._captured_isPropagationAborted_3)
+              if (t3.isPropagationAborted)
                 return;
-              if (t3._captured_listenerHasValue_1 === true) {
-                t2 = t3._captured_listenerValueOrError_2;
+              if (t3.listenerHasValue === true) {
+                t2 = t3.listenerValueOrError;
                 t2 = (sourceValue == null ? t2 != null : sourceValue !== t2) && !!J.getInterceptor(t2).$isFuture;
               } else
                 t2 = false;
               if (t2) {
-                chainSource = t3._captured_listenerValueOrError_2;
+                chainSource = t3.listenerValueOrError;
                 result = J.get$result$x(listeners);
                 if (chainSource instanceof P._Future)
                   if (chainSource._state >= 4) {
                     result.set$_isChained(true);
-                    t1._captured_source_4 = chainSource;
+                    t1.source = chainSource;
                     listeners = new P._FutureListener(null, result, 0, null, null);
                     t2 = chainSource;
                     continue;
                   } else
                     P._Future__chainCoreFuture(chainSource, result);
                 else
                   P._Future__chainForeignFuture(chainSource, result);
                 return;
               }
             }
             result = J.get$result$x(listeners);
             listeners = result._removeListeners$0();
-            t2 = t3._captured_listenerHasValue_1;
-            t3 = t3._captured_listenerValueOrError_2;
+            t2 = t3.listenerHasValue;
+            t3 = t3.listenerValueOrError;
             if (t2 === true)
               result._setValue$1(t3);
             else
               result._setErrorObject$1(t3);
-            t1._captured_source_4 = result;
+            t1.source = result;
             t2 = result;
           }
         }}
     },
     _Future__addListener_closure: {
-      "^": "Closure:1;_async$_captured_this_0,_captured_listener_1",
+      "^": "Closure:1;$this,listener",
       call$0: [function() {
-        P._Future__propagateToListeners(this._async$_captured_this_0, this._captured_listener_1);
+        P._Future__propagateToListeners(this.$this, this.listener);
       }, null, null, 0, 0, null, "call"]
     },
     _Future__chainForeignFuture_closure: {
-      "^": "Closure:0;_captured_target_0",
+      "^": "Closure:0;target",
       call$1: [function(value) {
-        this._captured_target_0._completeWithValue$1(value);
-      }, null, null, 2, 0, null, 8, "call"]
+        this.target._completeWithValue$1(value);
+      }, null, null, 2, 0, null, 6, "call"]
     },
     _Future__chainForeignFuture_closure0: {
-      "^": "Closure:9;_captured_target_1",
+      "^": "Closure:9;target",
       call$2: [function(error, stackTrace) {
-        this._captured_target_1._completeError$2(error, stackTrace);
+        this.target._completeError$2(error, stackTrace);
       }, function(error) {
         return this.call$2(error, null);
-      }, "call$1", null, null, null, 2, 2, null, 5, 3, 4, "call"]
+      }, "call$1", null, null, null, 2, 2, null, 5, 1, 2, "call"]
     },
     _Future__chainForeignFuture_closure1: {
-      "^": "Closure:1;_captured_target_2,_captured_e_3,_captured_s_4",
+      "^": "Closure:1;target,e,s",
       call$0: [function() {
-        this._captured_target_2._completeError$2(this._captured_e_3, this._captured_s_4);
+        this.target._completeError$2(this.e, this.s);
       }, null, null, 0, 0, null, "call"]
     },
     _Future__asyncComplete_closure: {
-      "^": "Closure:1;_async$_captured_this_0,_captured_coreFuture_1",
+      "^": "Closure:1;$this,coreFuture",
       call$0: [function() {
-        P._Future__chainCoreFuture(this._captured_coreFuture_1, this._async$_captured_this_0);
+        P._Future__chainCoreFuture(this.coreFuture, this.$this);
       }, null, null, 0, 0, null, "call"]
     },
     _Future__asyncComplete_closure0: {
-      "^": "Closure:1;_async$_captured_this_2,_captured_value_3",
+      "^": "Closure:1;$this,value",
       call$0: [function() {
-        this._async$_captured_this_2._completeWithValue$1(this._captured_value_3);
+        this.$this._completeWithValue$1(this.value);
       }, null, null, 0, 0, null, "call"]
     },
     _Future__asyncCompleteError_closure: {
-      "^": "Closure:1;_async$_captured_this_0,_captured_error_1,_captured_stackTrace_2",
+      "^": "Closure:1;$this,error,stackTrace",
       call$0: [function() {
-        this._async$_captured_this_0._completeError$2(this._captured_error_1, this._captured_stackTrace_2);
+        this.$this._completeError$2(this.error, this.stackTrace);
       }, null, null, 0, 0, null, "call"]
     },
     _Future__propagateToListeners_handleValueCallback: {
-      "^": "Closure:68;_box_1,_captured_listener_3,_captured_sourceValue_4,_captured_zone_5",
+      "^": "Closure:39;_box_1,listener,sourceValue,zone",
       call$0: function() {
         var e, s, exception, t1;
         try {
-          this._box_1._captured_listenerValueOrError_2 = this._captured_zone_5.runUnary$2(this._captured_listener_3.get$_onValue(), this._captured_sourceValue_4);
+          this._box_1.listenerValueOrError = this.zone.runUnary$2(this.listener.get$_onValue(), this.sourceValue);
           return true;
         } catch (exception) {
           t1 = H.unwrapException(exception);
           e = t1;
           s = H.getTraceFromException(exception);
-          this._box_1._captured_listenerValueOrError_2 = new P.AsyncError(e, s);
+          this._box_1.listenerValueOrError = new P.AsyncError(e, s);
           return false;
         }
       }
     },
     _Future__propagateToListeners_handleError: {
-      "^": "Closure:2;_box_2,_box_1,_captured_listener_6,_captured_zone_7",
+      "^": "Closure:2;_box_2,_box_1,listener,zone",
       call$0: function() {
         var asyncError, matchesTest, test, e, s, errorCallback, e0, s0, t1, exception, t2, listenerValueOrError, t3, t4;
-        asyncError = this._box_2._captured_source_4.get$_error();
+        asyncError = this._box_2.source.get$_error();
         matchesTest = true;
-        t1 = this._captured_listener_6;
+        t1 = this.listener;
         if (t1.get$hasErrorTest()) {
           test = t1.get$_errorTest();
           try {
-            matchesTest = this._captured_zone_7.runUnary$2(test, J.get$error$x(asyncError));
+            matchesTest = this.zone.runUnary$2(test, J.get$error$x(asyncError));
           } catch (exception) {
             t1 = H.unwrapException(exception);
             e = t1;
             s = H.getTraceFromException(exception);
             t1 = J.get$error$x(asyncError);
             t2 = e;
             listenerValueOrError = (t1 == null ? t2 == null : t1 === t2) ? asyncError : new P.AsyncError(e, s);
             t1 = this._box_1;
-            t1._captured_listenerValueOrError_2 = listenerValueOrError;
-            t1._captured_listenerHasValue_1 = false;
+            t1.listenerValueOrError = listenerValueOrError;
+            t1.listenerHasValue = false;
             return;
           }
         }
         errorCallback = t1.get$_onError();
         if (matchesTest === true && errorCallback != null) {
           try {
             t1 = errorCallback;
             t2 = H.getDynamicRuntimeType();
             t2 = H.buildFunctionType(t2, [t2, t2])._isTest$1(t1);
-            t3 = this._captured_zone_7;
+            t3 = this.zone;
             t4 = this._box_1;
             if (t2)
-              t4._captured_listenerValueOrError_2 = t3.runBinary$3(errorCallback, J.get$error$x(asyncError), asyncError.get$stackTrace());
+              t4.listenerValueOrError = t3.runBinary$3(errorCallback, J.get$error$x(asyncError), asyncError.get$stackTrace());
             else
-              t4._captured_listenerValueOrError_2 = t3.runUnary$2(errorCallback, J.get$error$x(asyncError));
+              t4.listenerValueOrError = t3.runUnary$2(errorCallback, J.get$error$x(asyncError));
           } catch (exception) {
             t1 = H.unwrapException(exception);
             e0 = t1;
             s0 = H.getTraceFromException(exception);
             t1 = J.get$error$x(asyncError);
             t2 = e0;
             listenerValueOrError = (t1 == null ? t2 == null : t1 === t2) ? asyncError : new P.AsyncError(e0, s0);
             t1 = this._box_1;
-            t1._captured_listenerValueOrError_2 = listenerValueOrError;
-            t1._captured_listenerHasValue_1 = false;
+            t1.listenerValueOrError = listenerValueOrError;
+            t1.listenerHasValue = false;
             return;
           }
-          this._box_1._captured_listenerHasValue_1 = true;
+          this._box_1.listenerHasValue = true;
         } else {
           t1 = this._box_1;
-          t1._captured_listenerValueOrError_2 = asyncError;
-          t1._captured_listenerHasValue_1 = false;
+          t1.listenerValueOrError = asyncError;
+          t1.listenerHasValue = false;
         }
       }
     },
     _Future__propagateToListeners_handleWhenCompleteCallback: {
-      "^": "Closure:2;_box_2,_box_1,_captured_hasError_8,_captured_listener_9,_captured_zone_10",
+      "^": "Closure:2;_box_2,_box_1,hasError,listener,zone",
       call$0: function() {
         var t1, e, s, completeResult, t2, exception, result;
         t1 = {};
-        t1._captured_completeResult_0 = null;
+        t1.completeResult = null;
         try {
-          completeResult = this._captured_zone_10.run$1(this._captured_listener_9.get$_whenCompleteAction());
-          t1._captured_completeResult_0 = completeResult;
+          completeResult = this.zone.run$1(this.listener.get$_whenCompleteAction());
+          t1.completeResult = completeResult;
           t2 = completeResult;
         } catch (exception) {
           t1 = H.unwrapException(exception);
           e = t1;
           s = H.getTraceFromException(exception);
-          if (this._captured_hasError_8) {
-            t1 = J.get$error$x(this._box_2._captured_source_4.get$_error());
+          if (this.hasError) {
+            t1 = J.get$error$x(this._box_2.source.get$_error());
             t2 = e;
             t2 = t1 == null ? t2 == null : t1 === t2;
             t1 = t2;
           } else
             t1 = false;
           t2 = this._box_1;
           if (t1)
-            t2._captured_listenerValueOrError_2 = this._box_2._captured_source_4.get$_error();
+            t2.listenerValueOrError = this._box_2.source.get$_error();
           else
-            t2._captured_listenerValueOrError_2 = new P.AsyncError(e, s);
-          t2._captured_listenerHasValue_1 = false;
+            t2.listenerValueOrError = new P.AsyncError(e, s);
+          t2.listenerHasValue = false;
           return;
         }
         if (!!J.getInterceptor(t2).$isFuture) {
-          result = J.get$result$x(this._captured_listener_9);
+          result = J.get$result$x(this.listener);
           result.set$_isChained(true);
-          this._box_1._captured_isPropagationAborted_3 = true;
+          this._box_1.isPropagationAborted = true;
           t2.then$2$onError(new P._Future__propagateToListeners_handleWhenCompleteCallback_closure(this._box_2, result), new P._Future__propagateToListeners_handleWhenCompleteCallback_closure0(t1, result));
         }
       }
     },
     _Future__propagateToListeners_handleWhenCompleteCallback_closure: {
-      "^": "Closure:0;_box_2,_captured_result_11",
+      "^": "Closure:0;_box_2,result",
       call$1: [function(ignored) {
-        P._Future__propagateToListeners(this._box_2._captured_source_4, new P._FutureListener(null, this._captured_result_11, 0, null, null));
-      }, null, null, 2, 0, null, 33, "call"]
+        P._Future__propagateToListeners(this._box_2.source, new P._FutureListener(null, this.result, 0, null, null));
+      }, null, null, 2, 0, null, 34, "call"]
     },
     _Future__propagateToListeners_handleWhenCompleteCallback_closure0: {
-      "^": "Closure:9;_async$_box_0,_captured_result_12",
+      "^": "Closure:9;_box_0,result",
       call$2: [function(error, stackTrace) {
         var t1, completeResult;
-        t1 = this._async$_box_0;
-        if (!(t1._captured_completeResult_0 instanceof P._Future)) {
+        t1 = this._box_0;
+        if (!(t1.completeResult instanceof P._Future)) {
           completeResult = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null]);
-          t1._captured_completeResult_0 = completeResult;
+          t1.completeResult = completeResult;
           completeResult._setError$2(error, stackTrace);
         }
-        P._Future__propagateToListeners(t1._captured_completeResult_0, new P._FutureListener(null, this._captured_result_12, 0, null, null));
+        P._Future__propagateToListeners(t1.completeResult, new P._FutureListener(null, this.result, 0, null, null));
       }, function(error) {
         return this.call$2(error, null);
-      }, "call$1", null, null, null, 2, 2, null, 5, 3, 4, "call"]
+      }, "call$1", null, null, null, 2, 2, null, 5, 1, 2, "call"]
     },
     _AsyncCallbackEntry: {
-      "^": "Object;callback,zone<,next@",
-      callback$0: function() {
-        return this.callback.call$0();
-      }
+      "^": "Object;callback,next"
     },
     Stream: {
       "^": "Object;",
       map$1: function(_, convert) {
         return H.setRuntimeTypeInfo(new P._MapStream(convert, this), [H.getRuntimeTypeArgument(this, "Stream", 0), null]);
       },
       pipe$1: function(streamConsumer) {
-        return streamConsumer._async$_target.addStream$2$cancelOnError(this, true).then$1(new P.Stream_pipe_closure(streamConsumer));
+        return streamConsumer.addStream$1(this).then$1(new P.Stream_pipe_closure(streamConsumer));
       },
       contains$1: function(_, needle) {
         var t1, future;
         t1 = {};
         future = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [P.bool]);
-        t1._captured_subscription_0 = null;
-        t1._captured_subscription_0 = this.listen$4$cancelOnError$onDone$onError(new P.Stream_contains_closure(t1, this, needle, future), true, new P.Stream_contains_closure0(future), future.get$_completeError());
+        t1.subscription = null;
+        t1.subscription = this.listen$4$cancelOnError$onDone$onError(new P.Stream_contains_closure(t1, this, needle, future), true, new P.Stream_contains_closure0(future), future.get$_completeError());
         return future;
       },
       forEach$1: function(_, action) {
         var t1, future;
         t1 = {};
         future = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null]);
-        t1._captured_subscription_0 = null;
-        t1._captured_subscription_0 = this.listen$4$cancelOnError$onDone$onError(new P.Stream_forEach_closure(t1, this, action, future), true, new P.Stream_forEach_closure0(future), future.get$_completeError());
+        t1.subscription = null;
+        t1.subscription = this.listen$4$cancelOnError$onDone$onError(new P.Stream_forEach_closure(t1, this, action, future), true, new P.Stream_forEach_closure0(future), future.get$_completeError());
         return future;
       },
       get$length: function(_) {
         var t1, future;
         t1 = {};
         future = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [P.$int]);
-        t1._captured_count_0 = 0;
+        t1.count = 0;
         this.listen$4$cancelOnError$onDone$onError(new P.Stream_length_closure(t1), true, new P.Stream_length_closure0(t1, future), future.get$_completeError());
         return future;
       },
       get$isEmpty: function(_) {
         var t1, future;
         t1 = {};
         future = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [P.bool]);
-        t1._captured_subscription_0 = null;
-        t1._captured_subscription_0 = this.listen$4$cancelOnError$onDone$onError(new P.Stream_isEmpty_closure(t1, future), true, new P.Stream_isEmpty_closure0(future), future.get$_completeError());
+        t1.subscription = null;
+        t1.subscription = this.listen$4$cancelOnError$onDone$onError(new P.Stream_isEmpty_closure(t1, future), true, new P.Stream_isEmpty_closure0(future), future.get$_completeError());
         return future;
       },
       toList$0: function(_) {
         var result, future;
         result = H.setRuntimeTypeInfo([], [H.getRuntimeTypeArgument(this, "Stream", 0)]);
         future = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [[P.List, H.getRuntimeTypeArgument(this, "Stream", 0)]]);
         this.listen$4$cancelOnError$onDone$onError(new P.Stream_toList_closure(this, result), true, new P.Stream_toList_closure0(result, future), future.get$_completeError());
         return future;
       },
       get$last: function(_) {
         var t1, future;
         t1 = {};
         future = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [H.getRuntimeTypeArgument(this, "Stream", 0)]);
-        t1._captured_result_0 = null;
-        t1._captured_foundResult_1 = false;
+        t1.result = null;
+        t1.foundResult = false;
         this.listen$4$cancelOnError$onDone$onError(new P.Stream_last_closure(t1, this), true, new P.Stream_last_closure0(t1, future), future.get$_completeError());
         return future;
       }
     },
     Stream_pipe_closure: {
-      "^": "Closure:0;_captured_streamConsumer_0",
+      "^": "Closure:0;streamConsumer",
       call$1: [function(_) {
-        return this._captured_streamConsumer_0._async$_target.close$0(0);
-      }, null, null, 2, 0, null, 11, "call"]
+        return this.streamConsumer.close$0(0);
+      }, null, null, 2, 0, null, 9, "call"]
     },
     Stream_contains_closure: {
-      "^": "Closure;_async$_box_0,_async$_captured_this_1,_captured_needle_2,_captured_future_3",
+      "^": "Closure;_box_0,$this,needle,future",
       call$1: [function(element) {
         var t1, t2;
-        t1 = this._async$_box_0;
-        t2 = this._captured_future_3;
-        P._runUserCode(new P.Stream_contains__closure(this._captured_needle_2, element), new P.Stream_contains__closure0(t1, t2), P._cancelAndErrorClosure(t1._captured_subscription_0, t2));
-      }, null, null, 2, 0, null, 21, "call"],
+        t1 = this._box_0;
+        t2 = this.future;
+        P._runUserCode(new P.Stream_contains__closure(this.needle, element), new P.Stream_contains__closure0(t1, t2), P._cancelAndErrorClosure(t1.subscription, t2));
+      }, null, null, 2, 0, null, 23, "call"],
       $signature: function() {
         return H.computeSignature(function(T) {
           return {func: 1, args: [T]};
-        }, this._async$_captured_this_1, "Stream");
+        }, this.$this, "Stream");
       }
     },
     Stream_contains__closure: {
-      "^": "Closure:1;_captured_needle_4,_captured_element_5",
+      "^": "Closure:1;needle,element",
       call$0: function() {
-        return J.$eq$(this._captured_element_5, this._captured_needle_4);
+        return J.$eq$(this.element, this.needle);
       }
     },
     Stream_contains__closure0: {
-      "^": "Closure:51;_async$_box_0,_captured_future_6",
+      "^": "Closure:38;_box_0,future",
       call$1: function(isMatch) {
         if (isMatch === true)
-          P._cancelAndValue(this._async$_box_0._captured_subscription_0, this._captured_future_6, true);
+          P._cancelAndValue(this._box_0.subscription, this.future, true);
       }
     },
     Stream_contains_closure0: {
-      "^": "Closure:1;_captured_future_7",
+      "^": "Closure:1;future",
       call$0: [function() {
-        this._captured_future_7._complete$1(false);
+        this.future._complete$1(false);
       }, null, null, 0, 0, null, "call"]
     },
     Stream_forEach_closure: {
-      "^": "Closure;_async$_box_0,_async$_captured_this_1,_captured_action_2,_captured_future_3",
+      "^": "Closure;_box_0,$this,action,future",
       call$1: [function(element) {
-        P._runUserCode(new P.Stream_forEach__closure(this._captured_action_2, element), new P.Stream_forEach__closure0(), P._cancelAndErrorClosure(this._async$_box_0._captured_subscription_0, this._captured_future_3));
-      }, null, null, 2, 0, null, 21, "call"],
+        P._runUserCode(new P.Stream_forEach__closure(this.action, element), new P.Stream_forEach__closure0(), P._cancelAndErrorClosure(this._box_0.subscription, this.future));
+      }, null, null, 2, 0, null, 23, "call"],
       $signature: function() {
         return H.computeSignature(function(T) {
           return {func: 1, args: [T]};
-        }, this._async$_captured_this_1, "Stream");
+        }, this.$this, "Stream");
       }
     },
     Stream_forEach__closure: {
-      "^": "Closure:1;_captured_action_4,_captured_element_5",
+      "^": "Closure:1;action,element",
       call$0: function() {
-        return this._captured_action_4.call$1(this._captured_element_5);
+        return this.action.call$1(this.element);
       }
     },
     Stream_forEach__closure0: {
       "^": "Closure:0;",
       call$1: function(_) {
       }
     },
     Stream_forEach_closure0: {
-      "^": "Closure:1;_captured_future_6",
+      "^": "Closure:1;future",
       call$0: [function() {
-        this._captured_future_6._complete$1(null);
+        this.future._complete$1(null);
       }, null, null, 0, 0, null, "call"]
     },
     Stream_length_closure: {
-      "^": "Closure:0;_async$_box_0",
+      "^": "Closure:0;_box_0",
       call$1: [function(_) {
-        ++this._async$_box_0._captured_count_0;
-      }, null, null, 2, 0, null, 11, "call"]
+        ++this._box_0.count;
+      }, null, null, 2, 0, null, 9, "call"]
     },
     Stream_length_closure0: {
-      "^": "Closure:1;_async$_box_0,_captured_future_1",
+      "^": "Closure:1;_box_0,future",
       call$0: [function() {
-        this._captured_future_1._complete$1(this._async$_box_0._captured_count_0);
+        this.future._complete$1(this._box_0.count);
       }, null, null, 0, 0, null, "call"]
     },
     Stream_isEmpty_closure: {
-      "^": "Closure:0;_async$_box_0,_captured_future_1",
+      "^": "Closure:0;_box_0,future",
       call$1: [function(_) {
-        P._cancelAndValue(this._async$_box_0._captured_subscription_0, this._captured_future_1, false);
-      }, null, null, 2, 0, null, 11, "call"]
+        P._cancelAndValue(this._box_0.subscription, this.future, false);
+      }, null, null, 2, 0, null, 9, "call"]
     },
     Stream_isEmpty_closure0: {
-      "^": "Closure:1;_captured_future_2",
+      "^": "Closure:1;future",
       call$0: [function() {
-        this._captured_future_2._complete$1(true);
+        this.future._complete$1(true);
       }, null, null, 0, 0, null, "call"]
     },
     Stream_toList_closure: {
-      "^": "Closure;_async$_captured_this_0,_async$_captured_result_1",
+      "^": "Closure;$this,result",
       call$1: [function(data) {
-        this._async$_captured_result_1.push(data);
-      }, null, null, 2, 0, null, 12, "call"],
+        this.result.push(data);
+      }, null, null, 2, 0, null, 15, "call"],
       $signature: function() {
         return H.computeSignature(function(T) {
           return {func: 1, args: [T]};
-        }, this._async$_captured_this_0, "Stream");
+        }, this.$this, "Stream");
       }
     },
     Stream_toList_closure0: {
-      "^": "Closure:1;_captured_result_2,_captured_future_3",
+      "^": "Closure:1;result,future",
       call$0: [function() {
-        this._captured_future_3._complete$1(this._captured_result_2);
+        this.future._complete$1(this.result);
       }, null, null, 0, 0, null, "call"]
     },
     Stream_last_closure: {
-      "^": "Closure;_async$_box_0,_async$_captured_this_1",
+      "^": "Closure;_box_0,$this",
       call$1: [function(value) {
-        var t1 = this._async$_box_0;
-        t1._captured_foundResult_1 = true;
-        t1._captured_result_0 = value;
-      }, null, null, 2, 0, null, 8, "call"],
+        var t1 = this._box_0;
+        t1.foundResult = true;
+        t1.result = value;
+      }, null, null, 2, 0, null, 6, "call"],
       $signature: function() {
         return H.computeSignature(function(T) {
           return {func: 1, args: [T]};
-        }, this._async$_captured_this_1, "Stream");
+        }, this.$this, "Stream");
       }
     },
     Stream_last_closure0: {
-      "^": "Closure:1;_async$_box_0,_captured_future_2",
+      "^": "Closure:1;_box_0,future",
       call$0: [function() {
         var e, s, t1, exception;
-        t1 = this._async$_box_0;
-        if (t1._captured_foundResult_1) {
-          this._captured_future_2._complete$1(t1._captured_result_0);
+        t1 = this._box_0;
+        if (t1.foundResult) {
+          this.future._complete$1(t1.result);
           return;
         }
         try {
           t1 = H.IterableElementError_noElement();
           throw H.wrapException(t1);
         } catch (exception) {
           t1 = H.unwrapException(exception);
           e = t1;
           s = H.getTraceFromException(exception);
-          P._completeWithErrorCallback(this._captured_future_2, e, s);
+          P._completeWithErrorCallback(this.future, e, s);
         }
       }, null, null, 0, 0, null, "call"]
     },
     StreamSubscription: {
       "^": "Object;"
     },
-    StreamController: {
-      "^": "Object;"
-    },
     _StreamController: {
       "^": "Object;",
       get$isPaused: function() {
         var t1 = this._state;
         return (t1 & 1) !== 0 ? this.get$_subscription().get$_isInputPaused() : (t1 & 2) === 0;
       },
       get$_pendingEvents: function() {
         if ((this._state & 8) === 0)
           return this._varData;
         return this._varData.get$varData();
@@ skipping 16 matching lines @@
       get$_subscription: function() {
         if ((this._state & 8) !== 0)
           return this._varData.get$varData();
         return this._varData;
       },
       _badEventState$0: function() {
         if ((this._state & 4) !== 0)
           return new P.StateError("Cannot add event after closing");
         return new P.StateError("Cannot add event while adding a stream");
       },
-      addStream$2$cancelOnError: function(source, cancelOnError) {
-        var t1, t2, t3, t4, addState;
-        t1 = this._state;
-        if (t1 >= 4)
-          throw H.wrapException(this._badEventState$0());
-        if ((t1 & 2) !== 0) {
-          t1 = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null]);
-          t1._asyncComplete$1(null);
-          return t1;
-        }
-        t1 = this._varData;
-        t2 = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null]);
-        t3 = this.get$_async$_add();
-        t4 = cancelOnError ? P._AddStreamState_makeErrorHandler(this) : this.get$_addError();
-        addState = H.setRuntimeTypeInfo(new P._StreamControllerAddStreamState(t1, t2, source.listen$4$cancelOnError$onDone$onError(t3, cancelOnError, this.get$_close(), t4)), [null]);
-        t1 = this._state;
-        if ((t1 & 1) !== 0 ? this.get$_subscription().get$_isInputPaused() : (t1 & 2) === 0)
-          addState.addSubscription.pause$0(0);
-        this._varData = addState;
-        this._state |= 8;
-        return addState.addStreamFuture;
-      },
       _ensureDoneFuture$0: function() {
         var t1 = this._doneFuture;
         if (t1 == null) {
           t1 = (this._state & 2) !== 0 ? $.$get$Future__nullFuture() : H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null]);
           this._doneFuture = t1;
         }
         return t1;
       },
-      add$1: function(_, value) {
+      add$1: [function(_, value) {
         if (this._state >= 4)
           throw H.wrapException(this._badEventState$0());
         this._async$_add$1(value);
-      },
+      }, "call$1", "get$add", 2, 0, function() {
+        return H.computeSignature(function(T) {
+          return {func: 1, v: true, args: [T]};
+        }, this.$receiver, "_StreamController");
+      }, 6],
       addError$2: [function(error, stackTrace) {
         var replacement;
         if (this._state >= 4)
           throw H.wrapException(this._badEventState$0());
         error = error != null ? error : new P.NullThrownError();
         replacement = $.Zone__current.errorCallback$2(error, stackTrace);
         if (replacement != null) {
           error = J.get$error$x(replacement);
           error = error != null ? error : new P.NullThrownError();
           stackTrace = replacement.get$stackTrace();
         }
-        this._addError$2(error, stackTrace);
+        this._async$_addError$2(error, stackTrace);
       }, function(error) {
         return this.addError$2(error, null);
-      }, "addError$1", "call$2", "call$1", "get$addError", 2, 2, 11, 5, 3, 4],
-      close$0: function(_) {
+      }, "addError$1", "call$2", "call$1", "get$addError", 2, 2, 10, 5, 1, 2],
+      close$0: [function(_) {
         var t1 = this._state;
         if ((t1 & 4) !== 0)
           return this._ensureDoneFuture$0();
         if (t1 >= 4)
           throw H.wrapException(this._badEventState$0());
         t1 |= 4;
         this._state = t1;
         if ((t1 & 1) !== 0)
           this._sendDone$0();
         else if ((t1 & 3) === 0)
           this._ensurePendingEvents$0().add$1(0, C.C__DelayedDone);
         return this._ensureDoneFuture$0();
-      },
-      _async$_add$1: [function(value) {
+      }, null, "get$close", 0, 0, null],
+      _async$_add$1: function(value) {
         var t1 = this._state;
         if ((t1 & 1) !== 0)
           this._sendData$1(value);
         else if ((t1 & 3) === 0)
           this._ensurePendingEvents$0().add$1(0, new P._DelayedData(value, null));
-      }, "call$1", "get$_async$_add", 2, 0, function() {
-        return H.computeSignature(function(T) {
-          return {func: 1, void: true, args: [T]};
-        }, this.$receiver, "_StreamController");
-      }, 8],
-      _addError$2: [function(error, stackTrace) {
+      },
+      _async$_addError$2: function(error, stackTrace) {
         var t1 = this._state;
         if ((t1 & 1) !== 0)
           this._sendError$2(error, stackTrace);
         else if ((t1 & 3) === 0)
           this._ensurePendingEvents$0().add$1(0, new P._DelayedError(error, stackTrace, null));
-      }, "call$2", "get$_addError", 4, 0, 50, 3, 4],
-      _close$0: [function() {
-        var addState = this._varData;
-        this._varData = addState.get$varData();
-        this._state &= 4294967287;
-        addState.complete$0(0);
-      }, "call$0", "get$_close", 0, 0, 2],
+      },
       _subscribe$4: function(onData, onError, onDone, cancelOnError) {
         var t1, subscription, pendingEvents, addState;
         if ((this._state & 3) !== 0)
           throw H.wrapException(new P.StateError("Stream has already been listened to."));
         t1 = $.Zone__current;
-        subscription = H.setRuntimeTypeInfo(new P._ControllerSubscription(this, null, null, null, t1, cancelOnError ? 1 : 0, null, null), [null]);
-        subscription._BufferingStreamSubscription$4(onData, onError, onDone, cancelOnError, null);
+        subscription = new P._ControllerSubscription(this, null, null, null, t1, cancelOnError ? 1 : 0, null, null);
+        subscription.$builtinTypeInfo = this.$builtinTypeInfo;
+        subscription._BufferingStreamSubscription$4(onData, onError, onDone, cancelOnError, H.getTypeArgumentByIndex(this, 0));
         pendingEvents = this.get$_pendingEvents();
         t1 = this._state |= 1;
         if ((t1 & 8) !== 0) {
           addState = this._varData;
           addState.set$varData(subscription);
           addState.resume$0();
         } else
           this._varData = subscription;
         subscription._setPendingEvents$1(pendingEvents);
         subscription._guardCallback$1(new P._StreamController__subscribe_closure(this));
         return subscription;
       },
       _recordCancel$1: function(subscription) {
         var result, e, s, t1, exception, result0;
         result = null;
         if ((this._state & 8) !== 0)
           result = this._varData.cancel$0();
         this._varData = null;
         this._state = this._state & 4294967286 | 2;
-        t1 = this._onCancel;
+        t1 = this.onCancel;
         if (t1 != null)
           if (result == null)
             try {
-              result = this._onCancel$0();
+              result = this.onCancel$0();
             } catch (exception) {
               t1 = H.unwrapException(exception);
               e = t1;
               s = H.getTraceFromException(exception);
               result0 = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null]);
               result0._asyncCompleteError$2(e, s);
               result = result0;
             }
           else
             result = result.whenComplete$1(t1);
         t1 = new P._StreamController__recordCancel_complete(this);
         if (result != null)
           result = result.whenComplete$1(t1);
         else
           t1.call$0();
         return result;
       },
-      _onCancel$0: function() {
-        return this._onCancel.call$0();
+      onCancel$0: function() {
+        return this.onCancel.call$0();
       }
     },
     _StreamController__subscribe_closure: {
-      "^": "Closure:1;_async$_captured_this_0",
+      "^": "Closure:1;$this",
       call$0: function() {
-        P._runGuarded(this._async$_captured_this_0._onListen);
+        P._runGuarded(this.$this.onListen);
       }
     },
     _StreamController__recordCancel_complete: {
-      "^": "Closure:2;_async$_captured_this_0",
+      "^": "Closure:2;$this",
       call$0: [function() {
-        var t1 = this._async$_captured_this_0._doneFuture;
+        var t1 = this.$this._doneFuture;
         if (t1 != null && t1._state === 0)
           t1._asyncComplete$1(null);
       }, null, null, 0, 0, null, "call"]
     },
     _SyncStreamControllerDispatch: {
       "^": "Object;",
       _sendData$1: function(data) {
         this.get$_subscription()._async$_add$1(data);
       },
       _sendError$2: function(error, stackTrace) {
-        this.get$_subscription()._addError$2(error, stackTrace);
+        this.get$_subscription()._async$_addError$2(error, stackTrace);
       },
       _sendDone$0: function() {
         this.get$_subscription()._close$0();
       }
     },
-    _AsyncStreamControllerDispatch: {
-      "^": "Object;",
-      _sendData$1: function(data) {
-        this.get$_subscription()._addPending$1(new P._DelayedData(data, null));
-      },
-      _sendError$2: function(error, stackTrace) {
-        this.get$_subscription()._addPending$1(new P._DelayedError(error, stackTrace, null));
-      },
-      _sendDone$0: function() {
-        this.get$_subscription()._addPending$1(C.C__DelayedDone);
-      }
-    },
-    _AsyncStreamController: {
-      "^": "_StreamController+_AsyncStreamControllerDispatch;_varData,_state,_doneFuture,_onListen,_onPause,_onResume,_onCancel"
-    },
     _SyncStreamController: {
-      "^": "_StreamController+_SyncStreamControllerDispatch;_varData,_state,_doneFuture,_onListen,_onPause,_onResume,_onCancel"
+      "^": "_StreamController+_SyncStreamControllerDispatch;_varData,_state,_doneFuture,onListen,onPause,onResume,onCancel"
     },
     _ControllerStream: {
       "^": "_StreamImpl;_controller",
-      _createSubscription$4: function(onData, onError, onDone, cancelOnError) {
-        return this._controller._subscribe$4(onData, onError, onDone, cancelOnError);
-      },
       get$hashCode: function(_) {
         return (H.Primitives_objectHashCode(this._controller) ^ 892482866) >>> 0;
       },
       $eq: function(_, other) {
         if (other == null)
           return false;
         if (this === other)
           return true;
         if (!(other instanceof P._ControllerStream))
           return false;
         return other._controller === this._controller;
       }
     },
     _ControllerSubscription: {
       "^": "_BufferingStreamSubscription;_controller,_async$_onData,_onError,_onDone,_zone,_state,_cancelFuture,_pending",
       _onCancel$0: function() {
         return this._controller._recordCancel$1(this);
       },
       _onPause$0: [function() {
         var t1 = this._controller;
         if ((t1._state & 8) !== 0)
           t1._varData.pause$0(0);
-        P._runGuarded(t1._onPause);
+        P._runGuarded(t1.onPause);
       }, "call$0", "get$_onPause", 0, 0, 2],
       _onResume$0: [function() {
         var t1 = this._controller;
         if ((t1._state & 8) !== 0)
           t1._varData.resume$0();
-        P._runGuarded(t1._onResume);
+        P._runGuarded(t1.onResume);
       }, "call$0", "get$_onResume", 0, 0, 2]
     },
     _StreamSinkWrapper: {
       "^": "Object;_async$_target",
-      add$1: function(_, data) {
+      add$1: [function(_, data) {
         var t1 = this._async$_target;
         if (t1._state >= 4)
           H.throwExpression(t1._badEventState$0());
         t1._async$_add$1(data);
-      },
-      close$0: function(_) {
-        return this._async$_target.close$0(0);
-      }
-    },
-    _AddStreamState: {
-      "^": "Object;",
-      pause$0: function(_) {
-        this.addSubscription.pause$0(0);
-      },
-      resume$0: function() {
-        this.addSubscription.resume$0();
-      },
-      cancel$0: function() {
-        var cancel = this.addSubscription.cancel$0();
-        if (cancel == null) {
-          this.addStreamFuture._asyncComplete$1(null);
-          return;
-        }
-        return cancel.whenComplete$1(new P._AddStreamState_cancel_closure(this));
-      },
-      complete$0: function(_) {
-        this.addStreamFuture._asyncComplete$1(null);
-      }
-    },
-    _AddStreamState_makeErrorHandler_closure: {
-      "^": "Closure:4;_captured_controller_0",
-      call$2: [function(e, s) {
-        var t1 = this._captured_controller_0;
-        t1._addError$2(e, s);
-        t1._close$0();
-      }, null, null, 4, 0, null, 23, 24, "call"]
-    },
-    _AddStreamState_cancel_closure: {
-      "^": "Closure:1;_async$_captured_this_0",
-      call$0: [function() {
-        this._async$_captured_this_0.addStreamFuture._asyncComplete$1(null);
-      }, null, null, 0, 0, null, "call"]
-    },
-    _StreamControllerAddStreamState: {
-      "^": "_AddStreamState;varData@,addStreamFuture,addSubscription"
+      }, "call$1", "get$add", 2, 0, function() {
+        return H.computeSignature(function(T) {
+          return {func: 1, v: true, args: [T]};
+        }, this.$receiver, "_StreamSinkWrapper");
+      }, 15]
     },
     _EventSink: {
       "^": "Object;"
     },
     _BufferingStreamSubscription: {
-      "^": "Object;_async$_onData,_onError<,_onDone,_zone<,_state,_cancelFuture,_pending",
+      "^": "Object;_onError<,_zone<",
       _setPendingEvents$1: function(pendingEvents) {
         if (pendingEvents == null)
           return;
         this._pending = pendingEvents;
         if (!pendingEvents.get$isEmpty(pendingEvents)) {
           this._state = (this._state | 64) >>> 0;
           this._pending.schedule$1(this);
         }
       },
       pause$1: function(_, resumeSignal) {
@@ skipping 58 matching lines @@
       },
       _async$_add$1: ["super$_BufferingStreamSubscription$_add", function(data) {
         var t1 = this._state;
         if ((t1 & 8) !== 0)
           return;
         if (t1 < 32)
           this._sendData$1(data);
         else
           this._addPending$1(new P._DelayedData(data, null));
       }],
-      _addError$2: ["super$_BufferingStreamSubscription$_addError", function(error, stackTrace) {
+      _async$_addError$2: ["super$_BufferingStreamSubscription$_addError", function(error, stackTrace) {
         var t1 = this._state;
         if ((t1 & 8) !== 0)
           return;
         if (t1 < 32)
           this._sendError$2(error, stackTrace);
         else
           this._addPending$1(new P._DelayedError(error, stackTrace, null));
       }],
       _close$0: function() {
         var t1 = this._state;
@@ skipping 106 matching lines @@
             this._onPause$0();
           else
             this._onResume$0();
           this._state = (this._state & 4294967263) >>> 0;
         }
         t1 = this._state;
         if ((t1 & 64) !== 0 && t1 < 128)
           this._pending.schedule$1(this);
       },
       _BufferingStreamSubscription$4: function(onData, onError, onDone, cancelOnError, $T) {
-        var t1 = this._zone;
-        this._async$_onData = t1.registerUnaryCallback$1(onData);
+        var handleData, t1;
+        handleData = onData == null ? P.async___nullDataHandler$closure() : onData;
+        t1 = this._zone;
+        this._async$_onData = t1.registerUnaryCallback$1(handleData);
         this._onError = P._registerErrorHandler(onError == null ? P.async___nullErrorHandler$closure() : onError, t1);
         this._onDone = t1.registerCallback$1(onDone == null ? P.async___nullDoneHandler$closure() : onDone);
-      },
-      static: {_BufferingStreamSubscription$: function(onData, onError, onDone, cancelOnError, $T) {
-          var t1 = $.Zone__current;
-          t1 = H.setRuntimeTypeInfo(new P._BufferingStreamSubscription(null, null, null, t1, cancelOnError ? 1 : 0, null, null), [$T]);
-          t1._BufferingStreamSubscription$4(onData, onError, onDone, cancelOnError, $T);
-          return t1;
-        }}
+      }
     },
     _BufferingStreamSubscription__sendError_sendError: {
-      "^": "Closure:2;_async$_captured_this_0,_captured_error_1,_captured_stackTrace_2",
+      "^": "Closure:2;$this,error,stackTrace",
       call$0: [function() {
         var t1, t2, t3, t4, t5, t6;
-        t1 = this._async$_captured_this_0;
+        t1 = this.$this;
         t2 = t1._state;
         if ((t2 & 8) !== 0 && (t2 & 16) === 0)
           return;
         t1._state = (t2 | 32) >>> 0;
         t2 = t1._onError;
         t3 = H.getDynamicRuntimeType();
         t3 = H.buildFunctionType(t3, [t3, t3])._isTest$1(t2);
         t4 = t1._zone;
-        t5 = this._captured_error_1;
+        t5 = this.error;
         t6 = t1._onError;
         if (t3)
-          t4.runBinaryGuarded$3(t6, t5, this._captured_stackTrace_2);
+          t4.runBinaryGuarded$3(t6, t5, this.stackTrace);
         else
           t4.runUnaryGuarded$2(t6, t5);
         t1._state = (t1._state & 4294967263) >>> 0;
       }, null, null, 0, 0, null, "call"]
     },
     _BufferingStreamSubscription__sendDone_sendDone: {
-      "^": "Closure:2;_async$_captured_this_0",
+      "^": "Closure:2;$this",
       call$0: [function() {
         var t1, t2;
-        t1 = this._async$_captured_this_0;
+        t1 = this.$this;
         t2 = t1._state;
         if ((t2 & 16) === 0)
           return;
         t1._state = (t2 | 42) >>> 0;
         t1._zone.runGuarded$1(t1._onDone);
         t1._state = (t1._state & 4294967263) >>> 0;
       }, null, null, 0, 0, null, "call"]
     },
     _StreamImpl: {
       "^": "Stream;",
       listen$4$cancelOnError$onDone$onError: function(onData, cancelOnError, onDone, onError) {
-        return this._createSubscription$4(onData, onError, onDone, true === cancelOnError);
+        return this._controller._subscribe$4(onData, onError, onDone, true === cancelOnError);
       },
       listen$1: function(onData) {
         return this.listen$4$cancelOnError$onDone$onError(onData, null, null, null);
       },
+      listen$3$onDone$onError: function(onData, onDone, onError) {
+        return this.listen$4$cancelOnError$onDone$onError(onData, null, onDone, onError);
+      },
       listen$2$onDone: function(onData, onDone) {
         return this.listen$4$cancelOnError$onDone$onError(onData, null, onDone, null);
       },
       listen$3$onDone$onError: function(onData, onDone, onError) {
         return this.listen$4$cancelOnError$onDone$onError(onData, null, onDone, onError);
-      },
-      listen$3$onDone$onError: function(onData, onDone, onError) {
-        return this.listen$4$cancelOnError$onDone$onError(onData, null, onDone, onError);
-      },
-      _createSubscription$4: function(onData, onError, onDone, cancelOnError) {
-        return P._BufferingStreamSubscription$(onData, onError, onDone, cancelOnError, H.getTypeArgumentByIndex(this, 0));
       }
     },
     _DelayedEvent: {
       "^": "Object;next@"
     },
     _DelayedData: {
       "^": "_DelayedEvent;value,next",
       perform$1: function(dispatch) {
         dispatch._sendData$1(this.value);
       }
@@ skipping 28 matching lines @@
         }
         P.scheduleMicrotask(new P._PendingEvents_schedule_closure(this, dispatch));
         this._state = 1;
       },
       cancelSchedule$0: function() {
         if (this._state === 1)
           this._state = 3;
       }
     },
     _PendingEvents_schedule_closure: {
-      "^": "Closure:1;_async$_captured_this_0,_captured_dispatch_1",
+      "^": "Closure:1;$this,dispatch",
       call$0: [function() {
-        var t1, oldState;
-        t1 = this._async$_captured_this_0;
+        var t1, oldState, $event, t2;
+        t1 = this.$this;
         oldState = t1._state;
         t1._state = 0;
         if (oldState === 3)
           return;
-        t1.handleNext$1(this._captured_dispatch_1);
+        $event = t1.firstPendingEvent;
+        t2 = $event.get$next();
+        t1.firstPendingEvent = t2;
+        if (t2 == null)
+          t1.lastPendingEvent = null;
+        $event.perform$1(this.dispatch);
       }, null, null, 0, 0, null, "call"]
     },
     _StreamImplEvents: {
       "^": "_PendingEvents;firstPendingEvent,lastPendingEvent,_state",
       get$isEmpty: function(_) {
         return this.lastPendingEvent == null;
       },
       add$1: function(_, $event) {
         var t1 = this.lastPendingEvent;
         if (t1 == null) {
           this.lastPendingEvent = $event;
           this.firstPendingEvent = $event;
         } else {
           t1.set$next($event);
           this.lastPendingEvent = $event;
         }
+      }
+    },
+    _DoneStreamSubscription: {
+      "^": "Object;_zone<,_state,_onDone",
+      get$isPaused: function() {
+        return this._state >= 4;
       },
-      handleNext$1: function(dispatch) {
-        var $event, t1;
-        $event = this.firstPendingEvent;
-        t1 = $event.get$next();
-        this.firstPendingEvent = t1;
-        if (t1 == null)
-          this.lastPendingEvent = null;
-        $event.perform$1(dispatch);
-      }
+      _schedule$0: function() {
+        if ((this._state & 2) !== 0)
+          return;
+        this._zone.scheduleMicrotask$1(this.get$_sendDone());
+        this._state = (this._state | 2) >>> 0;
+      },
+      pause$1: function(_, resumeSignal) {
+        this._state += 4;
+      },
+      pause$0: function($receiver) {
+        return this.pause$1($receiver, null);
+      },
+      resume$0: function() {
+        var t1 = this._state;
+        if (t1 >= 4) {
+          t1 -= 4;
+          this._state = t1;
+          if (t1 < 4 && (t1 & 1) === 0)
+            this._schedule$0();
+        }
+      },
+      cancel$0: function() {
+        return;
+      },
+      _sendDone$0: [function() {
+        var t1 = (this._state & 4294967293) >>> 0;
+        this._state = t1;
+        if (t1 >= 4)
+          return;
+        this._state = (t1 | 1) >>> 0;
+        t1 = this._onDone;
+        if (t1 != null)
+          this._zone.runGuarded$1(t1);
+      }, "call$0", "get$_sendDone", 0, 0, 2]
     },
     _StreamIteratorImpl: {
       "^": "Object;_subscription,_async$_current,_futureOrPrefetch,_state",
       _clear$0: function(_) {
         this._subscription = null;
         this._futureOrPrefetch = null;
         this._async$_current = null;
         this._state = 1;
       },
       _async$_onData$1: [function(data) {
         var hasNext;
         if (this._state === 2) {
           this._async$_current = data;
           hasNext = this._futureOrPrefetch;
           this._futureOrPrefetch = null;
           this._state = 0;
           hasNext._complete$1(true);
           return;
         }
         this._subscription.pause$0(0);
         this._futureOrPrefetch = data;
         this._state = 3;
       }, "call$1", "get$_async$_onData", 2, 0, function() {
         return H.computeSignature(function(T) {
-          return {func: 1, void: true, args: [T]};
+          return {func: 1, v: true, args: [T]};
         }, this.$receiver, "_StreamIteratorImpl");
-      }, 12],
+      }, 15],
       _onError$2: [function(error, stackTrace) {
         var hasNext;
         if (this._state === 2) {
           hasNext = this._futureOrPrefetch;
           this._clear$0(0);
           hasNext._completeError$2(error, stackTrace);
           return;
         }
         this._subscription.pause$0(0);
         this._futureOrPrefetch = new P.AsyncError(error, stackTrace);
         this._state = 4;
       }, function(error) {
         return this._onError$2(error, null);
-      }, "_onError$1", "call$2", "call$1", "get$_onError", 2, 2, 11, 5, 3, 4],
+      }, "_onError$1", "call$2", "call$1", "get$_onError", 2, 2, 10, 5, 1, 2],
       _onDone$0: [function() {
         if (this._state === 2) {
           var hasNext = this._futureOrPrefetch;
           this._clear$0(0);
           hasNext._complete$1(false);
           return;
         }
         this._subscription.pause$0(0);
         this._futureOrPrefetch = null;
         this._state = 5;
       }, "call$0", "get$_onDone", 0, 0, 2]
     },
+    _EmptyStream: {
+      "^": "Stream;",
+      listen$4$cancelOnError$onDone$onError: function(onData, cancelOnError, onDone, onError) {
+        var t1 = new P._DoneStreamSubscription($.Zone__current, 0, onDone);
+        t1._schedule$0();
+        return t1;
+      },
+      listen$1: function(onData) {
+        return this.listen$4$cancelOnError$onDone$onError(onData, null, null, null);
+      },
+      listen$3$onDone$onError: function(onData, onDone, onError) {
+        return this.listen$4$cancelOnError$onDone$onError(onData, null, onDone, onError);
+      }
+    },
     _cancelAndError_closure: {
-      "^": "Closure:1;_captured_future_0,_captured_error_1,_captured_stackTrace_2",
+      "^": "Closure:1;future,error,stackTrace",
       call$0: [function() {
-        return this._captured_future_0._completeError$2(this._captured_error_1, this._captured_stackTrace_2);
+        return this.future._completeError$2(this.error, this.stackTrace);
       }, null, null, 0, 0, null, "call"]
     },
     _cancelAndErrorClosure_closure: {
-      "^": "Closure:4;_captured_subscription_0,_captured_future_1",
+      "^": "Closure:5;subscription,future",
       call$2: function(error, stackTrace) {
-        return P._cancelAndError(this._captured_subscription_0, this._captured_future_1, error, stackTrace);
+        return P._cancelAndError(this.subscription, this.future, error, stackTrace);
       }
     },
     _cancelAndValue_closure: {
-      "^": "Closure:1;_captured_future_0,_captured_value_1",
+      "^": "Closure:1;future,value",
       call$0: [function() {
-        return this._captured_future_0._complete$1(this._captured_value_1);
+        return this.future._complete$1(this.value);
       }, null, null, 0, 0, null, "call"]
     },
     _ForwardingStream: {
       "^": "Stream;",
       listen$4$cancelOnError$onDone$onError: function(onData, cancelOnError, onDone, onError) {
         return this._createSubscription$4(onData, onError, onDone, true === cancelOnError);
       },
+      listen$1: function(onData) {
+        return this.listen$4$cancelOnError$onDone$onError(onData, null, null, null);
+      },
       listen$3$onDone$onError: function(onData, onDone, onError) {
         return this.listen$4$cancelOnError$onDone$onError(onData, null, onDone, onError);
       },
       _createSubscription$4: function(onData, onError, onDone, cancelOnError) {
         return P._ForwardingStreamSubscription$(this, onData, onError, onDone, cancelOnError, H.getRuntimeTypeArgument(this, "_ForwardingStream", 0), H.getRuntimeTypeArgument(this, "_ForwardingStream", 1));
       },
       _handleData$2: function(data, sink) {
         sink._async$_add$1(data);
       },
       $asStream: function($S, $T) {
         return [$T];
       }
     },
     _ForwardingStreamSubscription: {
       "^": "_BufferingStreamSubscription;_stream,_subscription,_async$_onData,_onError,_onDone,_zone,_state,_cancelFuture,_pending",
       _async$_add$1: function(data) {
         if ((this._state & 2) !== 0)
           return;
         this.super$_BufferingStreamSubscription$_add(data);
       },
-      _addError$2: function(error, stackTrace) {
+      _async$_addError$2: function(error, stackTrace) {
         if ((this._state & 2) !== 0)
           return;
         this.super$_BufferingStreamSubscription$_addError(error, stackTrace);
       },
       _onPause$0: [function() {
         var t1 = this._subscription;
         if (t1 == null)
           return;
         t1.pause$0(0);
       }, "call$0", "get$_onPause", 0, 0, 2],
       _onResume$0: [function() {
         var t1 = this._subscription;
         if (t1 == null)
           return;
         t1.resume$0();
       }, "call$0", "get$_onResume", 0, 0, 2],
       _onCancel$0: function() {
         var t1 = this._subscription;
         if (t1 != null) {
           this._subscription = null;
-          t1.cancel$0();
+          return t1.cancel$0();
         }
         return;
       },
       _handleData$1: [function(data) {
         this._stream._handleData$2(data, this);
       }, "call$1", "get$_handleData", 2, 0, function() {
         return H.computeSignature(function(S, T) {
-          return {func: 1, void: true, args: [S]};
+          return {func: 1, v: true, args: [S]};
         }, this.$receiver, "_ForwardingStreamSubscription");
-      }, 12],
+      }, 15],
       _handleError$2: [function(error, stackTrace) {
-        this._addError$2(error, stackTrace);
-      }, "call$2", "get$_handleError", 4, 0, 18, 3, 4],
+        this._async$_addError$2(error, stackTrace);
+      }, "call$2", "get$_handleError", 4, 0, 11, 1, 2],
       _handleDone$0: [function() {
         this._close$0();
       }, "call$0", "get$_handleDone", 0, 0, 2],
       _ForwardingStreamSubscription$5: function(_stream, onData, onError, onDone, cancelOnError, $S, $T) {
         var t1, t2;
         t1 = this.get$_handleData();
         t2 = this.get$_handleError();
         this._subscription = this._stream._async$_source.listen$3$onDone$onError(t1, this.get$_handleDone(), t2);
       },
       $as_BufferingStreamSubscription: function($S, $T) {
@@ skipping 31 matching lines @@
       "^": "Object;"
     },
     AsyncError: {
       "^": "Object;error>,stackTrace<",
       toString$0: function(_) {
         return H.S(this.error);
       },
       $isError: 1
     },
     _ZoneFunction: {
-      "^": "Object;zone<,$function"
+      "^": "Object;zone,$function"
     },
     ZoneSpecification: {
       "^": "Object;"
     },
     _ZoneSpecification: {
       "^": "Object;handleUncaughtError<,run<,runUnary<,runBinary<,registerCallback<,registerUnaryCallback<,registerBinaryCallback<,errorCallback<,scheduleMicrotask<,createTimer<,createPeriodicTimer<,print>,fork<",
       handleUncaughtError$2: function(arg0, arg1) {
         return this.handleUncaughtError.call$2(arg0, arg1);
       },
       handleUncaughtError$3: function(arg0, arg1, arg2) {
@@ skipping 19 matching lines @@
       },
       errorCallback$2: function(arg0, arg1) {
         return this.errorCallback.call$2(arg0, arg1);
       },
       scheduleMicrotask$1: function(arg0) {
         return this.scheduleMicrotask.call$1(arg0);
       },
       createTimer$2: function(arg0, arg1) {
         return this.createTimer.call$2(arg0, arg1);
       },
+      createPeriodicTimer$2: function(arg0, arg1) {
+        return this.createPeriodicTimer.call$2(arg0, arg1);
+      },
       print$1: function($receiver, arg0) {
         return this.print.call$1(arg0);
       },
       fork$2$specification$zoneValues: function(arg0, arg1) {
         return this.fork.call$2$specification$zoneValues(arg0, arg1);
       }
     },
     ZoneDelegate: {
       "^": "Object;"
     },
     Zone: {
       "^": "Object;"
     },
     _ZoneDelegate: {
       "^": "Object;_delegationTarget",
       handleUncaughtError$3: [function(zone, error, stackTrace) {
         var implementation, implZone;
         implementation = this._delegationTarget.get$_handleUncaughtError();
         implZone = implementation.zone;
         return implementation.$function.call$5(implZone, P._parentDelegate(implZone), zone, error, stackTrace);
-      }, "call$3", "get$handleUncaughtError", 6, 0, 49],
+      }, "call$3", "get$handleUncaughtError", 6, 0, 36],
       run$2: [function(zone, f) {
         var implementation, implZone;
         implementation = this._delegationTarget.get$_run();
         implZone = implementation.zone;
         return implementation.$function.call$4(implZone, P._parentDelegate(implZone), zone, f);
-      }, "call$2", "get$run", 4, 0, 38],
+      }, "call$2", "get$run", 4, 0, 35],
       runUnary$3: [function(zone, f, arg) {
         var implementation, implZone;
         implementation = this._delegationTarget.get$_runUnary();
         implZone = implementation.zone;
         return implementation.$function.call$5(implZone, P._parentDelegate(implZone), zone, f, arg);
-      }, "call$3", "get$runUnary", 6, 0, 37],
+      }, "call$3", "get$runUnary", 6, 0, 34],
       runBinary$4: [function(zone, f, arg1, arg2) {
         var implementation, implZone;
         implementation = this._delegationTarget.get$_runBinary();
         implZone = implementation.zone;
         return implementation.$function.call$6(implZone, P._parentDelegate(implZone), zone, f, arg1, arg2);
-      }, "call$4", "get$runBinary", 8, 0, 36],
+      }, "call$4", "get$runBinary", 8, 0, 32],
       registerCallback$2: [function(zone, f) {
         var implementation, implZone;
         implementation = this._delegationTarget.get$_registerCallback();
         implZone = implementation.zone;
         return implementation.$function.call$4(implZone, P._parentDelegate(implZone), zone, f);
-      }, "call$2", "get$registerCallback", 4, 0, 35],
+      }, "call$2", "get$registerCallback", 4, 0, 31],
       registerUnaryCallback$2: [function(zone, f) {
         var implementation, implZone;
         implementation = this._delegationTarget.get$_registerUnaryCallback();
         implZone = implementation.zone;
         return implementation.$function.call$4(implZone, P._parentDelegate(implZone), zone, f);
-      }, "call$2", "get$registerUnaryCallback", 4, 0, 33],
+      }, "call$2", "get$registerUnaryCallback", 4, 0, 30],
       registerBinaryCallback$2: [function(zone, f) {
         var implementation, implZone;
         implementation = this._delegationTarget.get$_registerBinaryCallback();
         implZone = implementation.zone;
         return implementation.$function.call$4(implZone, P._parentDelegate(implZone), zone, f);
-      }, "call$2", "get$registerBinaryCallback", 4, 0, 32],
+      }, "call$2", "get$registerBinaryCallback", 4, 0, 33],
       errorCallback$3: [function(zone, error, stackTrace) {
         var implementation, implZone;
         implementation = this._delegationTarget.get$_errorCallback();
         implZone = implementation.zone;
         if (implZone === C.C__RootZone)
           return;
         return implementation.$function.call$5(implZone, P._parentDelegate(implZone), zone, error, stackTrace);
-      }, "call$3", "get$errorCallback", 6, 0, 31],
+      }, "call$3", "get$errorCallback", 6, 0, 23],
       scheduleMicrotask$2: [function(zone, f) {
         var implementation, implZone;
         implementation = this._delegationTarget.get$_scheduleMicrotask();
         implZone = implementation.zone;
         implementation.$function.call$4(implZone, P._parentDelegate(implZone), zone, f);
-      }, "call$2", "get$scheduleMicrotask", 4, 0, 34],
+      }, "call$2", "get$scheduleMicrotask", 4, 0, 24],
       createTimer$3: [function(zone, duration, f) {
         var implementation, implZone;
         implementation = this._delegationTarget.get$_createTimer();
         implZone = implementation.zone;
         return implementation.$function.call$5(implZone, P._parentDelegate(implZone), zone, duration, f);
-      }, "call$3", "get$createTimer", 6, 0, 29],
+      }, "call$3", "get$createTimer", 6, 0, 25],
       createPeriodicTimer$3: [function(zone, period, f) {
         var implementation, implZone;
         implementation = this._delegationTarget.get$_createPeriodicTimer();
         implZone = implementation.zone;
         return implementation.$function.call$5(implZone, P._parentDelegate(implZone), zone, period, f);
-      }, "call$3", "get$createPeriodicTimer", 6, 0, 28],
+      }, "call$3", "get$createPeriodicTimer", 6, 0, 26],
       print$2: [function(_, zone, line) {
         var implementation, implZone;
         implementation = this._delegationTarget.get$_print();
         implZone = implementation.zone;
         implementation.$function.call$4(implZone, P._parentDelegate(implZone), zone, line);
-      }, "call$2", "get$print", 4, 0, 26],
+      }, "call$2", "get$print", 4, 0, 27],
       fork$3: [function(zone, specification, zoneValues) {
         var implementation, implZone;
         implementation = this._delegationTarget.get$_fork();
         implZone = implementation.zone;
         return implementation.$function.call$5(implZone, P._parentDelegate(implZone), zone, specification, zoneValues);
-      }, "call$3", "get$fork", 6, 0, 27]
+      }, "call$3", "get$fork", 6, 0, 28]
     },
     _Zone: {
       "^": "Object;",
       inSameErrorZone$1: function(otherZone) {
         return this === otherZone || this.get$errorZone() === otherZone.get$errorZone();
       }
     },
     _CustomZone: {
-      "^": "_Zone;_runUnary<,_run<,_runBinary<,_registerCallback<,_registerUnaryCallback<,_registerBinaryCallback<,_errorCallback<,_scheduleMicrotask<,_createTimer<,_createPeriodicTimer<,_print<,_fork<,_handleUncaughtError<,_delegateCache,parent>,_map<",
+      "^": "_Zone;_runUnary<,_run<,_runBinary<,_registerCallback<,_registerUnaryCallback<,_registerBinaryCallback<,_errorCallback<,_scheduleMicrotask<,_createTimer<,_createPeriodicTimer<,_print<,_fork<,_handleUncaughtError<,_delegateCache,parent>,_async$_map<",
       get$_delegate: function() {
         var t1 = this._delegateCache;
         if (t1 != null)
           return t1;
         t1 = new P._ZoneDelegate(this);
         this._delegateCache = t1;
         return t1;
       },
       get$errorZone: function() {
         return this._handleUncaughtError.zone;
@@ skipping 39 matching lines @@
         if (runGuarded)
           return new P._CustomZone_bindCallback_closure(this, registered);
         else
           return new P._CustomZone_bindCallback_closure0(this, registered);
       },
       bindCallback$1: function(f) {
         return this.bindCallback$2$runGuarded(f, true);
       },
       bindUnaryCallback$2$runGuarded: function(f, runGuarded) {
         var registered = this.registerUnaryCallback$1(f);
-        if (runGuarded)
-          return new P._CustomZone_bindUnaryCallback_closure(this, registered);
-        else
-          return new P._CustomZone_bindUnaryCallback_closure0(this, registered);
+        return new P._CustomZone_bindUnaryCallback_closure(this, registered);
       },
       bindUnaryCallback$1: function(f) {
         return this.bindUnaryCallback$2$runGuarded(f, true);
       },
       $index: function(_, key) {
         var t1, result, t2, value;
-        t1 = this._map;
+        t1 = this._async$_map;
         result = t1.$index(0, key);
         if (result != null || t1.containsKey$1(key))
           return result;
         t2 = this.parent;
         if (t2 != null) {
           value = J.$index$asx(t2, key);
           if (value != null)
             t1.$indexSet(0, key, value);
           return value;
         }
         return;
       },
       handleUncaughtError$2: [function(error, stackTrace) {
         var implementation, t1, parentDelegate;
         implementation = this._handleUncaughtError;
         t1 = implementation.zone;
         parentDelegate = P._parentDelegate(t1);
         return implementation.$function.call$5(t1, parentDelegate, this, error, stackTrace);
-      }, "call$2", "get$handleUncaughtError", 4, 0, 4],
+      }, "call$2", "get$handleUncaughtError", 4, 0, 5],
       fork$2$specification$zoneValues: [function(specification, zoneValues) {
         var implementation, t1, parentDelegate;
         implementation = this._fork;
         t1 = implementation.zone;
         parentDelegate = P._parentDelegate(t1);
         return implementation.$function.call$5(t1, parentDelegate, this, specification, zoneValues);
       }, function() {
         return this.fork$2$specification$zoneValues(null, null);
-      }, "fork$0", "call$2$specification$zoneValues", "call$0", "get$fork", 0, 5, 25, 5, 5],
+      }, "fork$0", "call$2$specification$zoneValues", "call$0", "get$fork", 0, 5, 22, 5, 5],
       run$1: [function(f) {
         var implementation, t1, parentDelegate;
         implementation = this._run;
         t1 = implementation.zone;
         parentDelegate = P._parentDelegate(t1);
         return implementation.$function.call$4(t1, parentDelegate, this, f);
-      }, "call$1", "get$run", 2, 0, 24],
+      }, "call$1", "get$run", 2, 0, 21],
       runUnary$2: [function(f, arg) {
         var implementation, t1, parentDelegate;
         implementation = this._runUnary;
         t1 = implementation.zone;
         parentDelegate = P._parentDelegate(t1);
         return implementation.$function.call$5(t1, parentDelegate, this, f, arg);
-      }, "call$2", "get$runUnary", 4, 0, 23],
+      }, "call$2", "get$runUnary", 4, 0, 20],
       runBinary$3: [function(f, arg1, arg2) {
         var implementation, t1, parentDelegate;
         implementation = this._runBinary;
         t1 = implementation.zone;
         parentDelegate = P._parentDelegate(t1);
         return implementation.$function.call$6(t1, parentDelegate, this, f, arg1, arg2);
-      }, "call$3", "get$runBinary", 6, 0, 22],
+      }, "call$3", "get$runBinary", 6, 0, 19],
       registerCallback$1: [function(f) {
         var implementation, t1, parentDelegate;
         implementation = this._registerCallback;
         t1 = implementation.zone;
         parentDelegate = P._parentDelegate(t1);
         return implementation.$function.call$4(t1, parentDelegate, this, f);
-      }, "call$1", "get$registerCallback", 2, 0, 21],
+      }, "call$1", "get$registerCallback", 2, 0, 8],
       registerUnaryCallback$1: [function(f) {
         var implementation, t1, parentDelegate;
         implementation = this._registerUnaryCallback;
         t1 = implementation.zone;
         parentDelegate = P._parentDelegate(t1);
         return implementation.$function.call$4(t1, parentDelegate, this, f);
-      }, "call$1", "get$registerUnaryCallback", 2, 0, 20],
+      }, "call$1", "get$registerUnaryCallback", 2, 0, 18],
       registerBinaryCallback$1: [function(f) {
         var implementation, t1, parentDelegate;
         implementation = this._registerBinaryCallback;
         t1 = implementation.zone;
         parentDelegate = P._parentDelegate(t1);
         return implementation.$function.call$4(t1, parentDelegate, this, f);
-      }, "call$1", "get$registerBinaryCallback", 2, 0, 10],
+      }, "call$1", "get$registerBinaryCallback", 2, 0, 17],
       errorCallback$2: [function(error, stackTrace) {
         var implementation, implementationZone, parentDelegate;
         implementation = this._errorCallback;
         implementationZone = implementation.zone;
         if (implementationZone === C.C__RootZone)
           return;
         parentDelegate = P._parentDelegate(implementationZone);
         return implementation.$function.call$5(implementationZone, parentDelegate, this, error, stackTrace);
-      }, "call$2", "get$errorCallback", 4, 0, 19],
+      }, "call$2", "get$errorCallback", 4, 0, 16],
       scheduleMicrotask$1: [function(f) {
         var implementation, t1, parentDelegate;
         implementation = this._scheduleMicrotask;
         t1 = implementation.zone;
         parentDelegate = P._parentDelegate(t1);
         return implementation.$function.call$4(t1, parentDelegate, this, f);
-      }, "call$1", "get$scheduleMicrotask", 2, 0, 5],
+      }, "call$1", "get$scheduleMicrotask", 2, 0, 4],
       createTimer$2: [function(duration, f) {
         var implementation, t1, parentDelegate;
         implementation = this._createTimer;
         t1 = implementation.zone;
         parentDelegate = P._parentDelegate(t1);
         return implementation.$function.call$5(t1, parentDelegate, this, duration, f);
-      }, "call$2", "get$createTimer", 4, 0, 17],
+      }, "call$2", "get$createTimer", 4, 0, 14],
       createPeriodicTimer$2: [function(duration, f) {
         var implementation, t1, parentDelegate;
         implementation = this._createPeriodicTimer;
         t1 = implementation.zone;
         parentDelegate = P._parentDelegate(t1);
         return implementation.$function.call$5(t1, parentDelegate, this, duration, f);
-      }, "call$2", "get$createPeriodicTimer", 4, 0, 16],
+      }, "call$2", "get$createPeriodicTimer", 4, 0, 13],
       print$1: [function(_, line) {
         var implementation, t1, parentDelegate;
         implementation = this._print;
         t1 = implementation.zone;
         parentDelegate = P._parentDelegate(t1);
         return implementation.$function.call$4(t1, parentDelegate, this, line);
-      }, "call$1", "get$print", 2, 0, 6]
+      }, "call$1", "get$print", 2, 0, 7]
     },
     _CustomZone_bindCallback_closure: {
-      "^": "Closure:1;_async$_captured_this_0,_captured_registered_1",
+      "^": "Closure:1;$this,registered",
       call$0: [function() {
-        return this._async$_captured_this_0.runGuarded$1(this._captured_registered_1);
+        return this.$this.runGuarded$1(this.registered);
       }, null, null, 0, 0, null, "call"]
     },
     _CustomZone_bindCallback_closure0: {
-      "^": "Closure:1;_async$_captured_this_2,_captured_registered_3",
+      "^": "Closure:1;$this,registered",
       call$0: [function() {
-        return this._async$_captured_this_2.run$1(this._captured_registered_3);
+        return this.$this.run$1(this.registered);
       }, null, null, 0, 0, null, "call"]
     },
     _CustomZone_bindUnaryCallback_closure: {
-      "^": "Closure:0;_async$_captured_this_0,_captured_registered_1",
+      "^": "Closure:0;$this,registered",
       call$1: [function(arg) {
-        return this._async$_captured_this_0.runUnaryGuarded$2(this._captured_registered_1, arg);
-      }, null, null, 2, 0, null, 9, "call"]
-    },
-    _CustomZone_bindUnaryCallback_closure0: {
-      "^": "Closure:0;_async$_captured_this_2,_captured_registered_3",
-      call$1: [function(arg) {
-        return this._async$_captured_this_2.runUnary$2(this._captured_registered_3, arg);
-      }, null, null, 2, 0, null, 9, "call"]
+        return this.$this.runUnaryGuarded$2(this.registered, arg);
+      }, null, null, 2, 0, null, 13, "call"]
     },
     _rootHandleUncaughtError_closure: {
-      "^": "Closure:1;_captured_error_0,_captured_stackTrace_1",
+      "^": "Closure:1;_box_0,stackTrace",
       call$0: function() {
-        var t1 = this._captured_error_0;
-        throw H.wrapException(new P._UncaughtAsyncError(t1, P._UncaughtAsyncError__getBestStackTrace(t1, this._captured_stackTrace_1)));
+        var t1, t2, error;
+        t1 = this._box_0;
+        t2 = t1.error;
+        if (t2 == null) {
+          error = new P.NullThrownError();
+          t1.error = error;
+          t1 = error;
+        } else
+          t1 = t2;
+        t2 = this.stackTrace;
+        if (t2 == null)
+          throw H.wrapException(t1);
+        error = H.wrapException(t1);
+        error.stack = J.toString$0$(t2);
+        throw error;
       }
     },
     _RootZone: {
       "^": "_Zone;",
       get$_run: function() {
         return C._ZoneFunction__RootZone__rootRun;
       },
       get$_runUnary: function() {
         return C._ZoneFunction__RootZone__rootRunUnary;
       },
@@ skipping 26 matching lines @@
       },
       get$_fork: function() {
         return C._ZoneFunction__RootZone__rootFork;
       },
       get$_handleUncaughtError: function() {
         return C._ZoneFunction_NMc;
       },
       get$parent: function(_) {
         return;
       },
-      get$_map: function() {
+      get$_async$_map: function() {
         return $.$get$_RootZone__rootMap();
       },
       get$_delegate: function() {
         var t1 = $._RootZone__rootDelegate;
         if (t1 != null)
           return t1;
         t1 = new P._ZoneDelegate(this);
         $._RootZone__rootDelegate = t1;
         return t1;
       },
@@ skipping 51 matching lines @@
       bindCallback$2$runGuarded: function(f, runGuarded) {
         if (runGuarded)
           return new P._RootZone_bindCallback_closure(this, f);
         else
           return new P._RootZone_bindCallback_closure0(this, f);
       },
       bindCallback$1: function(f) {
         return this.bindCallback$2$runGuarded(f, true);
       },
       bindUnaryCallback$2$runGuarded: function(f, runGuarded) {
-        if (runGuarded)
-          return new P._RootZone_bindUnaryCallback_closure(this, f);
-        else
-          return new P._RootZone_bindUnaryCallback_closure0(this, f);
+        return new P._RootZone_bindUnaryCallback_closure(this, f);
       },
       bindUnaryCallback$1: function(f) {
         return this.bindUnaryCallback$2$runGuarded(f, true);
       },
       $index: function(_, key) {
         return;
       },
       handleUncaughtError$2: [function(error, stackTrace) {
         return P._rootHandleUncaughtError(null, null, this, error, stackTrace);
-      }, "call$2", "get$handleUncaughtError", 4, 0, 4],
+      }, "call$2", "get$handleUncaughtError", 4, 0, 5],
       fork$2$specification$zoneValues: [function(specification, zoneValues) {
         return P._rootFork(null, null, this, specification, zoneValues);
       }, function() {
         return this.fork$2$specification$zoneValues(null, null);
-      }, "fork$0", "call$2$specification$zoneValues", "call$0", "get$fork", 0, 5, 25, 5, 5],
+      }, "fork$0", "call$2$specification$zoneValues", "call$0", "get$fork", 0, 5, 22, 5, 5],
       run$1: [function(f) {
         if ($.Zone__current === C.C__RootZone)
           return f.call$0();
         return P._rootRun(null, null, this, f);
-      }, "call$1", "get$run", 2, 0, 24],
+      }, "call$1", "get$run", 2, 0, 21],
       runUnary$2: [function(f, arg) {
         if ($.Zone__current === C.C__RootZone)
           return f.call$1(arg);
         return P._rootRunUnary(null, null, this, f, arg);
-      }, "call$2", "get$runUnary", 4, 0, 23],
+      }, "call$2", "get$runUnary", 4, 0, 20],
       runBinary$3: [function(f, arg1, arg2) {
         if ($.Zone__current === C.C__RootZone)
           return f.call$2(arg1, arg2);
         return P._rootRunBinary(null, null, this, f, arg1, arg2);
-      }, "call$3", "get$runBinary", 6, 0, 22],
+      }, "call$3", "get$runBinary", 6, 0, 19],
       registerCallback$1: [function(f) {
         return f;
-      }, "call$1", "get$registerCallback", 2, 0, 21],
+      }, "call$1", "get$registerCallback", 2, 0, 8],
       registerUnaryCallback$1: [function(f) {
         return f;
-      }, "call$1", "get$registerUnaryCallback", 2, 0, 20],
+      }, "call$1", "get$registerUnaryCallback", 2, 0, 18],
       registerBinaryCallback$1: [function(f) {
         return f;
-      }, "call$1", "get$registerBinaryCallback", 2, 0, 10],
+      }, "call$1", "get$registerBinaryCallback", 2, 0, 17],
       errorCallback$2: [function(error, stackTrace) {
         return;
-      }, "call$2", "get$errorCallback", 4, 0, 19],
+      }, "call$2", "get$errorCallback", 4, 0, 16],
       scheduleMicrotask$1: [function(f) {
         P._rootScheduleMicrotask(null, null, this, f);
-      }, "call$1", "get$scheduleMicrotask", 2, 0, 5],
+      }, "call$1", "get$scheduleMicrotask", 2, 0, 4],
       createTimer$2: [function(duration, f) {
         return P.Timer__createTimer(duration, f);
-      }, "call$2", "get$createTimer", 4, 0, 17],
+      }, "call$2", "get$createTimer", 4, 0, 14],
       createPeriodicTimer$2: [function(duration, f) {
         return P.Timer__createPeriodicTimer(duration, f);
-      }, "call$2", "get$createPeriodicTimer", 4, 0, 16],
+      }, "call$2", "get$createPeriodicTimer", 4, 0, 13],
       print$1: [function(_, line) {
         H.printString(line);
-      }, "call$1", "get$print", 2, 0, 6]
+      }, "call$1", "get$print", 2, 0, 7]
     },
     _RootZone_bindCallback_closure: {
-      "^": "Closure:1;_async$_captured_this_0,_captured_f_1",
+      "^": "Closure:1;$this,f",
       call$0: [function() {
-        return this._async$_captured_this_0.runGuarded$1(this._captured_f_1);
+        return this.$this.runGuarded$1(this.f);
       }, null, null, 0, 0, null, "call"]
     },
     _RootZone_bindCallback_closure0: {
-      "^": "Closure:1;_async$_captured_this_2,_captured_f_3",
+      "^": "Closure:1;$this,f",
       call$0: [function() {
-        return this._async$_captured_this_2.run$1(this._captured_f_3);
+        return this.$this.run$1(this.f);
       }, null, null, 0, 0, null, "call"]
     },
     _RootZone_bindUnaryCallback_closure: {
-      "^": "Closure:0;_async$_captured_this_0,_captured_f_1",
+      "^": "Closure:0;$this,f",
       call$1: [function(arg) {
-        return this._async$_captured_this_0.runUnaryGuarded$2(this._captured_f_1, arg);
-      }, null, null, 2, 0, null, 9, "call"]
-    },
-    _RootZone_bindUnaryCallback_closure0: {
-      "^": "Closure:0;_async$_captured_this_2,_captured_f_3",
-      call$1: [function(arg) {
-        return this._async$_captured_this_2.runUnary$2(this._captured_f_3, arg);
-      }, null, null, 2, 0, null, 9, "call"]
+        return this.$this.runUnaryGuarded$2(this.f, arg);
+      }, null, null, 2, 0, null, 13, "call"]
     },
     runZoned_closure: {
-      "^": "Closure:40;_captured_onError_0",
+      "^": "Closure:41;onError",
       call$5: [function($self, $parent, zone, error, stackTrace) {
         var e, s, t1, t2, exception;
         try {
-          t1 = this._captured_onError_0;
+          t1 = this.onError;
           t2 = H.getDynamicRuntimeType();
           t2 = H.buildFunctionType(t2, [t2, t2])._isTest$1(t1);
           if (t2) {
             t1 = J.get$parent$x($self).runBinary$3(t1, error, stackTrace);
             return t1;
           }
           t1 = J.get$parent$x($self).runUnary$2(t1, error);
           return t1;
         } catch (exception) {
           t1 = H.unwrapException(exception);
           e = t1;
           s = H.getTraceFromException(exception);
           t1 = e;
           t2 = error;
           if (t1 == null ? t2 == null : t1 === t2)
             return $parent.handleUncaughtError$3(zone, error, stackTrace);
           else
             return $parent.handleUncaughtError$3(zone, e, s);
         }
-      }, null, null, 10, 0, null, 0, 1, 2, 3, 4, "call"]
+      }, null, null, 10, 0, null, 0, 3, 4, 1, 2, "call"]
     }
   }], ["dart.collection", "dart:collection",, P, {
     "^": "",
+    LinkedHashMap_LinkedHashMap$_empty: function($K, $V) {
+      return H.setRuntimeTypeInfo(new H.JsLinkedHashMap(0, null, null, null, null, null, 0), [$K, $V]);
+    },
     LinkedHashMap__makeEmpty: function() {
       return H.setRuntimeTypeInfo(new H.JsLinkedHashMap(0, null, null, null, null, null, 0), [null, null]);
     },
     LinkedHashMap__makeLiteral: function(keyValuePairs) {
       return H.fillLiteralMap(keyValuePairs, H.setRuntimeTypeInfo(new H.JsLinkedHashMap(0, null, null, null, null, null, 0), [null, null]));
     },
     HashMap_HashMap: function(equals, hashCode, isValidKey, $K, $V) {
       return H.setRuntimeTypeInfo(new P._HashMap(0, null, null, null, null), [$K, $V]);
     },
     HashMap_HashMap$from: function(other, $K, $V) {
       var result = P.HashMap_HashMap(null, null, null, $K, $V);
-      J.forEach$1$ax(other, new P.HashMap_HashMap$from_closure(result));
+      J.forEach$1$ax(other, new P.closure5(result));
       return result;
     },
     IterableBase_iterableToShortString: function(iterable, leftDelimiter, rightDelimiter) {
       var parts, t1;
       if (P._isToStringVisiting(iterable)) {
         if (leftDelimiter === "(" && rightDelimiter === ")")
           return "(...)";
         return leftDelimiter + "..." + rightDelimiter;
       }
       parts = [];
       t1 = $.$get$_toStringVisiting();
       t1.push(iterable);
       try {
         P._iterablePartsToStrings(iterable, parts);
       } finally {
         if (0 >= t1.length)
-          return H.ioore(t1, 0);
+          return H.ioore(t1, -1);
         t1.pop();
       }
       t1 = P.StringBuffer__writeAll(leftDelimiter, parts, ", ") + rightDelimiter;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
     IterableBase_iterableToFullString: function(iterable, leftDelimiter, rightDelimiter) {
       var buffer, t1, t2;
       if (P._isToStringVisiting(iterable))
         return leftDelimiter + "..." + rightDelimiter;
       buffer = new P.StringBuffer(leftDelimiter);
       t1 = $.$get$_toStringVisiting();
       t1.push(iterable);
       try {
         t2 = buffer;
         t2.set$_contents(P.StringBuffer__writeAll(t2.get$_contents(), iterable, ", "));
       } finally {
         if (0 >= t1.length)
-          return H.ioore(t1, 0);
+          return H.ioore(t1, -1);
         t1.pop();
       }
       t1 = buffer;
       t1.set$_contents(t1.get$_contents() + rightDelimiter);
       t1 = buffer.get$_contents();
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
     _isToStringVisiting: function(o) {
       var i, t1;
       for (i = 0; t1 = $.$get$_toStringVisiting(), i < t1.length; ++i) {
@@ skipping 15 matching lines @@
           return;
         next = H.S(it.get$current());
         parts.push(next);
         $length += next.length + 2;
         ++count;
       }
       if (!it.moveNext$0()) {
         if (count <= 5)
           return;
         if (0 >= parts.length)
-          return H.ioore(parts, 0);
+          return H.ioore(parts, -1);
         ultimateString = parts.pop();
         if (0 >= parts.length)
-          return H.ioore(parts, 0);
+          return H.ioore(parts, -1);
         penultimateString = parts.pop();
       } else {
         penultimate = it.get$current();
         ++count;
         if (!it.moveNext$0()) {
           if (count <= 4) {
             parts.push(H.S(penultimate));
             return;
           }
           ultimateString = H.S(penultimate);
           if (0 >= parts.length)
-            return H.ioore(parts, 0);
+            return H.ioore(parts, -1);
           penultimateString = parts.pop();
           $length += ultimateString.length + 2;
         } else {
           ultimate = it.get$current();
           ++count;
           for (; it.moveNext$0(); penultimate = ultimate, ultimate = ultimate0) {
             ultimate0 = it.get$current();
             ++count;
             if (count > 100) {
               while (true) {
                 if (!($length > 75 && count > 3))
                   break;
                 if (0 >= parts.length)
-                  return H.ioore(parts, 0);
+                  return H.ioore(parts, -1);
                 $length -= parts.pop().length + 2;
                 --count;
               }
               parts.push("...");
               return;
             }
           }
           penultimateString = H.S(penultimate);
           ultimateString = H.S(ultimate);
           $length += ultimateString.length + penultimateString.length + 4;
         }
       }
       if (count > parts.length + 2) {
         $length += 5;
         elision = "...";
       } else
         elision = null;
       while (true) {
         if (!($length > 80 && parts.length > 3))
           break;
         if (0 >= parts.length)
-          return H.ioore(parts, 0);
+          return H.ioore(parts, -1);
         $length -= parts.pop().length + 2;
         if (elision == null) {
           $length += 5;
           elision = "...";
         }
       }
       if (elision != null)
         parts.push(elision);
       parts.push(penultimateString);
       parts.push(ultimateString);
     },
-    LinkedHashMap_LinkedHashMap: function(equals, hashCode, isValidKey, $K, $V) {
-      return H.setRuntimeTypeInfo(new H.JsLinkedHashMap(0, null, null, null, null, null, 0), [$K, $V]);
-    },
-    LinkedHashMap_LinkedHashMap$identity: function($K, $V) {
-      return P._LinkedIdentityHashMap__LinkedIdentityHashMap$es6($K, $V);
-    },
     LinkedHashSet_LinkedHashSet: function(equals, hashCode, isValidKey, $E) {
       return H.setRuntimeTypeInfo(new P._LinkedHashSet(0, null, null, null, null, null, 0), [$E]);
     },
     Maps_mapToString: function(m) {
       var t1, result, t2;
       t1 = {};
       if (P._isToStringVisiting(m))
         return "{...}";
       result = new P.StringBuffer("");
       try {
         $.$get$_toStringVisiting().push(m);
         t2 = result;
         t2.set$_contents(t2.get$_contents() + "{");
-        t1._captured_first_0 = true;
+        t1.first = true;
         J.forEach$1$ax(m, new P.Maps_mapToString_closure(t1, result));
         t1 = result;
         t1.set$_contents(t1.get$_contents() + "}");
       } finally {
         t1 = $.$get$_toStringVisiting();
         if (0 >= t1.length)
-          return H.ioore(t1, 0);
+          return H.ioore(t1, -1);
         t1.pop();
       }
       t1 = result.get$_contents();
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
     _HashMap: {
       "^": "Object;_collection$_length,_collection$_strings,_collection$_nums,_collection$_rest,_keys",
       get$length: function(_) {
         return this._collection$_length;
       },
@@ skipping 103 matching lines @@
           action.call$2(key, this.$index(0, key));
           if (keys !== this._keys)
             throw H.wrapException(new P.ConcurrentModificationError(this));
         }
       },
       _collection$_computeKeys$0: function() {
         var t1, result, strings, names, entries, index, i, nums, rest, bucket, $length, i0;
         t1 = this._keys;
         if (t1 != null)
           return t1;
-        result = Array(this._collection$_length);
+        result = new Array(this._collection$_length);
         result.fixed$length = Array;
         strings = this._collection$_strings;
         if (strings != null) {
           names = Object.getOwnPropertyNames(strings);
           entries = names.length;
           for (index = 0, i = 0; i < entries; ++i) {
             result[index] = names[i];
             ++index;
           }
         } else
@@ skipping 73 matching lines @@
         }
         return -1;
       },
       static: {_LinkedIdentityHashMap__LinkedIdentityHashMap$es6: function($K, $V) {
           return H.setRuntimeTypeInfo(new P._LinkedIdentityHashMap(0, null, null, null, null, null, 0), [$K, $V]);
         }}
     },
     _LinkedHashSet: {
       "^": "_HashSetBase;_collection$_length,_collection$_strings,_collection$_nums,_collection$_rest,_collection$_first,_collection$_last,_collection$_modifications",
       get$iterator: function(_) {
-        var t1 = new P.LinkedHashSetIterator(this, this._collection$_modifications, null, null);
+        var t1 = new P._LinkedHashSetIterator(this, this._collection$_modifications, null, null);
         t1._collection$_cell = this._collection$_first;
         return t1;
       },
       get$length: function(_) {
         return this._collection$_length;
       },
       get$isEmpty: function(_) {
         return this._collection$_length === 0;
       },
       get$isNotEmpty: function(_) {
@@ skipping 145 matching lines @@
           return false;
         cell = table[element];
         if (cell == null)
           return false;
         this._collection$_unlinkCell$1(cell);
         delete table[element];
         return true;
       },
       _collection$_newLinkedCell$1: function(element) {
         var cell, last;
-        cell = new P.LinkedHashSetCell(element, null, null);
+        cell = new P._LinkedHashSetCell(element, null, null);
         if (this._collection$_first == null) {
           this._collection$_last = cell;
           this._collection$_first = cell;
         } else {
           last = this._collection$_last;
           cell._collection$_previous = last;
           last._collection$_next = cell;
           this._collection$_last = cell;
         }
         ++this._collection$_length;
@@ skipping 29 matching lines @@
         return -1;
       },
       $isEfficientLength: 1,
       static: {_LinkedHashSet__newHashTable: function() {
           var table = Object.create(null);
           table["<non-identifier-key>"] = table;
           delete table["<non-identifier-key>"];
           return table;
         }}
     },
-    LinkedHashSetCell: {
+    _LinkedHashSetCell: {
       "^": "Object;_element<,_collection$_next<,_collection$_previous@"
     },
-    LinkedHashSetIterator: {
+    _LinkedHashSetIterator: {
       "^": "Object;_set,_collection$_modifications,_collection$_cell,_collection$_current",
       get$current: function() {
         return this._collection$_current;
       },
       moveNext$0: function() {
         var t1 = this._set;
         if (this._collection$_modifications !== t1._collection$_modifications)
           throw H.wrapException(new P.ConcurrentModificationError(t1));
         else {
           t1 = this._collection$_cell;
@@ skipping 13 matching lines @@
       get$length: function(_) {
         return this._collection$_source.length;
       },
       $index: function(_, index) {
         var t1 = this._collection$_source;
         if (index >>> 0 !== index || index >= t1.length)
           return H.ioore(t1, index);
         return t1[index];
       }
     },
-    HashMap_HashMap$from_closure: {
-      "^": "Closure:3;_captured_result_0",
+    closure5: {
+      "^": "Closure:3;result",
       call$2: [function(k, v) {
-        this._captured_result_0.$indexSet(0, k, v);
-      }, null, null, 4, 0, null, 34, 35, "call"]
+        this.result.$indexSet(0, k, v);
+      }, null, null, 4, 0, null, 35, 36, "call"]
     },
     _HashSetBase: {
       "^": "SetBase;"
     },
     IterableBase: {
       "^": "Iterable;"
     },
     ListBase: {
       "^": "Object_ListMixin;"
     },
@@ skipping 24 matching lines @@
         return this.get$length(receiver) === 0;
       },
       get$isNotEmpty: function(receiver) {
         return !this.get$isEmpty(receiver);
       },
       get$last: function(receiver) {
         if (this.get$length(receiver) === 0)
           throw H.wrapException(H.IterableElementError_noElement());
         return this.$index(receiver, this.get$length(receiver) - 1);
       },
+      get$single: function(receiver) {
+        if (this.get$length(receiver) === 0)
+          throw H.wrapException(H.IterableElementError_noElement());
+        if (this.get$length(receiver) > 1)
+          throw H.wrapException(H.IterableElementError_tooMany());
+        return this.$index(receiver, 0);
+      },
       contains$1: function(receiver, element) {
         var $length, i;
         $length = this.get$length(receiver);
         for (i = 0; i < this.get$length(receiver); ++i) {
           if (J.$eq$(this.$index(receiver, i), element))
             return true;
           if ($length !== this.get$length(receiver))
             throw H.wrapException(new P.ConcurrentModificationError(receiver));
         }
         return false;
       },
       map$1: function(receiver, f) {
         return H.setRuntimeTypeInfo(new H.MappedListIterable(receiver, f), [null, null]);
       },
       skip$1: function(receiver, count) {
         return H.SubListIterable$(receiver, count, null, H.getRuntimeTypeArgument(receiver, "ListMixin", 0));
       },
       add$1: function(receiver, element) {
         var t1 = this.get$length(receiver);
         this.set$length(receiver, t1 + 1);
         this.$indexSet(receiver, t1, element);
       },
       setRange$4: ["super$ListMixin$setRange", function(receiver, start, end, iterable, skipCount) {
-        var $length, t1, i;
+        var $length, t1, otherStart, otherList, i;
         P.RangeError_checkValidRange(start, end, this.get$length(receiver), null, null, null);
         $length = end - start;
         if ($length === 0)
           return;
-        t1 = J.getInterceptor$asx(iterable);
-        if (skipCount + $length > t1.get$length(iterable))
+        t1 = J.getInterceptor(iterable);
+        if (!!t1.$isList) {
+          otherStart = skipCount;
+          otherList = iterable;
+        } else {
+          otherList = t1.skip$1(iterable, skipCount).toList$1$growable(0, false);
+          otherStart = 0;
+        }
+        t1 = J.getInterceptor$asx(otherList);
+        if (otherStart + $length > t1.get$length(otherList))
           throw H.wrapException(H.IterableElementError_tooFew());
-        if (skipCount < start)
+        if (otherStart < start)
           for (i = $length - 1; i >= 0; --i)
-            this.$indexSet(receiver, start + i, t1.$index(iterable, skipCount + i));
+            this.$indexSet(receiver, start + i, t1.$index(otherList, otherStart + i));
         else
           for (i = 0; i < $length; ++i)
-            this.$indexSet(receiver, start + i, t1.$index(iterable, skipCount + i));
+            this.$indexSet(receiver, start + i, t1.$index(otherList, otherStart + i));
       }, function($receiver, start, end, iterable) {
         return this.setRange$4($receiver, start, end, iterable, 0);
-      }, "setRange$3", null, null, "get$setRange", 6, 2, null, 36],
+      }, "setRange$3", null, null, "get$setRange", 6, 2, null, 37],
       replaceRange$3: function(receiver, start, end, newContents) {
         var removeLength, insertLength, insertEnd, delta, newLength;
         P.RangeError_checkValidRange(start, end, this.get$length(receiver), null, null, null);
         newContents = C.JSString_methods.toList$0(newContents);
         removeLength = end - start;
         insertLength = newContents.length;
         insertEnd = start + insertLength;
         if (removeLength >= insertLength) {
           delta = removeLength - insertLength;
           newLength = this.get$length(receiver) - delta;
@@ skipping 37 matching lines @@
     _UnmodifiableMapMixin: {
       "^": "Object;",
       $indexSet: function(_, key, value) {
         throw H.wrapException(new P.UnsupportedError("Cannot modify unmodifiable map"));
       },
       $isMap: 1
     },
     MapView: {
       "^": "Object;",
       $index: function(_, key) {
-        return J.$index$asx(this._collection$_map, key);
+        return J.$index$asx(this._map, key);
       },
       $indexSet: function(_, key, value) {
-        J.$indexSet$ax(this._collection$_map, key, value);
+        J.$indexSet$ax(this._map, key, value);
       },
       forEach$1: function(_, action) {
-        J.forEach$1$ax(this._collection$_map, action);
+        J.forEach$1$ax(this._map, action);
       },
       get$isEmpty: function(_) {
-        return J.get$isEmpty$asx(this._collection$_map);
+        return J.get$isEmpty$asx(this._map);
       },
       get$isNotEmpty: function(_) {
-        return J.get$isNotEmpty$asx(this._collection$_map);
+        return J.get$isNotEmpty$asx(this._map);
       },
       get$length: function(_) {
-        return J.get$length$asx(this._collection$_map);
+        return J.get$length$asx(this._map);
       },
       toString$0: function(_) {
-        return J.toString$0$(this._collection$_map);
+        return J.toString$0$(this._map);
       },
       $isMap: 1
     },
     UnmodifiableMapView: {
-      "^": "MapView+_UnmodifiableMapMixin;_collection$_map",
+      "^": "MapView+_UnmodifiableMapMixin;_map",
       $isMap: 1
     },
     Maps_mapToString_closure: {
-      "^": "Closure:3;_collection$_box_0,_captured_result_1",
+      "^": "Closure:3;_box_0,result",
       call$2: function(k, v) {
         var t1, t2;
-        t1 = this._collection$_box_0;
-        if (!t1._captured_first_0)
-          this._captured_result_1._contents += ", ";
-        t1._captured_first_0 = false;
-        t1 = this._captured_result_1;
+        t1 = this._box_0;
+        if (!t1.first)
+          this.result._contents += ", ";
+        t1.first = false;
+        t1 = this.result;
         t2 = t1._contents += H.S(k);
         t1._contents = t2 + ": ";
         t1._contents += H.S(v);
       }
     },
     ListQueue: {
       "^": "Iterable;_table,_head,_tail,_modificationCount",
       get$iterator: function(_) {
         return new P._ListQueueIterator(this, this._tail, this._modificationCount, this._head, null);
       },
@@ skipping 73 matching lines @@
           return H.ioore(t1, t2);
         t1[t2] = element;
         t3 = (t2 + 1 & t3 - 1) >>> 0;
         this._tail = t3;
         if (this._head === t3)
           this._grow$0();
         ++this._modificationCount;
       },
       _grow$0: function() {
         var t1, newTable, t2, split;
-        t1 = Array(this._table.length * 2);
+        t1 = new Array(this._table.length * 2);
         t1.fixed$length = Array;
         newTable = H.setRuntimeTypeInfo(t1, [H.getTypeArgumentByIndex(this, 0)]);
         t1 = this._table;
         t2 = this._head;
         split = t1.length - t2;
         C.JSArray_methods.setRange$4(newTable, 0, split, t1, t2);
         C.JSArray_methods.setRange$4(newTable, split, split + this._head, this._table, 0);
         this._head = 0;
         this._tail = this._table.length;
         this._table = newTable;
       },
       ListQueue$1: function(initialCapacity, $E) {
-        var t1 = Array(8);
+        var t1 = new Array(8);
         t1.fixed$length = Array;
         this._table = H.setRuntimeTypeInfo(t1, [$E]);
       },
       $isEfficientLength: 1,
       static: {ListQueue$: function(initialCapacity, $E) {
           var t1 = H.setRuntimeTypeInfo(new P.ListQueue(null, 0, 0, 0), [$E]);
           t1.ListQueue$1(initialCapacity, $E);
           return t1;
         }}
     },
@@ skipping 17 matching lines @@
         if (t2 >= t3)
           return H.ioore(t1, t2);
         this._collection$_current = t1[t2];
         this._collection$_position = (t2 + 1 & t3 - 1) >>> 0;
         return true;
       }
     },
     SetMixin: {
       "^": "Object;",
       get$isEmpty: function(_) {
-        return this.get$length(this) === 0;
+        return this._collection$_length === 0;
       },
       get$isNotEmpty: function(_) {
-        return this.get$length(this) !== 0;
+        return this._collection$_length !== 0;
       },
       map$1: function(_, f) {
         return H.setRuntimeTypeInfo(new H.EfficientLengthMappedIterable(this, f), [H.getTypeArgumentByIndex(this, 0), null]);
       },
       toString$0: function(_) {
         return P.IterableBase_iterableToFullString(this, "{", "}");
       },
       forEach$1: function(_, f) {
         var t1;
-        for (t1 = this.get$iterator(this); t1.moveNext$0();)
+        for (t1 = new P._LinkedHashSetIterator(this, this._collection$_modifications, null, null), t1._collection$_cell = this._collection$_first; t1.moveNext$0();)
           f.call$1(t1._collection$_current);
       },
       get$last: function(_) {
         var it, result;
-        it = this.get$iterator(this);
+        it = new P._LinkedHashSetIterator(this, this._collection$_modifications, null, null);
+        it._collection$_cell = this._collection$_first;
         if (!it.moveNext$0())
           throw H.wrapException(H.IterableElementError_noElement());
         do
           result = it._collection$_current;
         while (it.moveNext$0());
         return result;
       },
       $isEfficientLength: 1
     },
     SetBase: {
@@ skipping 23 matching lines @@
         parsed = JSON.parse(source);
       } catch (exception) {
         t1 = H.unwrapException(exception);
         e = t1;
         throw H.wrapException(new P.FormatException(String(e), null, null));
       }
       return P._convertJsonToDartLazy(parsed);
     },
     _defaultToEncodable: [function(object) {
       return object.toJson$0();
-    }, "call$1", "convert___defaultToEncodable$closure", 2, 0, 13, 20],
+    }, "call$1", "convert___defaultToEncodable$closure", 2, 0, 12, 19],
     _JsonMap: {
       "^": "Object;_original,_processed,_data",
       $index: function(_, key) {
         var t1, result;
         t1 = this._processed;
         if (t1 == null)
           return this._data.$index(0, key);
         else if (typeof key !== "string")
           return;
         else {
@@ skipping 21 matching lines @@
       },
       get$isNotEmpty: function(_) {
         var t1;
         if (this._processed == null) {
           t1 = this._data;
           t1 = t1.get$length(t1);
         } else
           t1 = this._computeKeys$0().length;
         return t1 > 0;
       },
+      get$values: function(_) {
+        var t1;
+        if (this._processed == null) {
+          t1 = this._data;
+          return t1.get$values(t1);
+        }
+        return H.MappedIterable_MappedIterable(this._computeKeys$0(), new P._JsonMap_values_closure(this), null, null);
+      },
       $indexSet: function(_, key, value) {
         var processed, original;
         if (this._processed == null)
           this._data.$indexSet(0, key, value);
         else if (this.containsKey$1(key)) {
           processed = this._processed;
           processed[key] = value;
           original = this._original;
           if (original == null ? processed != null : original !== processed)
             original[key] = null;
         } else
           this._upgrade$0().$indexSet(0, key, value);
       },
       containsKey$1: function(key) {
         if (this._processed == null)
           return this._data.containsKey$1(key);
         if (typeof key !== "string")
           return false;
         return Object.prototype.hasOwnProperty.call(this._original, key);
       },
+      remove$1: function(_, key) {
+        if (this._processed != null && !this.containsKey$1(key))
+          return;
+        return this._upgrade$0().remove$1(0, key);
+      },
+      clear$0: function(_) {
+        var t1;
+        if (this._processed == null)
+          this._data.clear$0(0);
+        else {
+          t1 = this._data;
+          if (t1 != null)
+            J.clear$0$ax(t1);
+          this._processed = null;
+          this._original = null;
+          this._data = P.LinkedHashMap__makeEmpty();
+        }
+      },
       forEach$1: function(_, f) {
         var keys, i, key, value;
         if (this._processed == null)
           return this._data.forEach$1(0, f);
         keys = this._computeKeys$0();
         for (i = 0; i < keys.length; ++i) {
           key = keys[i];
           value = this._processed[key];
           if (typeof value == "undefined") {
             value = P._convertJsonToDartLazy(this._original[key]);
@@ skipping 37 matching lines @@
       _process$1: function(key) {
         var result;
         if (!Object.prototype.hasOwnProperty.call(this._original, key))
           return;
         result = P._convertJsonToDartLazy(this._original[key]);
         return this._processed[key] = result;
       },
       $isMap: 1,
       $asMap: Isolate.functionThatReturnsNull
     },
+    _JsonMap_values_closure: {
+      "^": "Closure:0;$this",
+      call$1: [function(each) {
+        return this.$this.$index(0, each);
+      }, null, null, 2, 0, null, 22, "call"]
+    },
     Codec: {
       "^": "Object;"
     },
     Converter: {
       "^": "Object;"
     },
     Encoding: {
       "^": "Codec;"
     },
     JsonUnsupportedObjectError: {
@@ skipping 99 matching lines @@
       },
       _checkCycle$1: function(object) {
         var t1, t2, i, t3;
         for (t1 = this._seen, t2 = t1.length, i = 0; i < t2; ++i) {
           t3 = t1[i];
           if (object == null ? t3 == null : object === t3)
             throw H.wrapException(new P.JsonCyclicError(object, null));
         }
         t1.push(object);
       },
-      _removeSeen$1: function(object) {
-        var t1 = this._seen;
-        if (0 >= t1.length)
-          return H.ioore(t1, 0);
-        t1.pop();
-      },
       writeObject$1: function(object) {
         var customJson, e, t1, exception;
         if (this.writeJsonValue$1(object))
           return;
         this._checkCycle$1(object);
         try {
           customJson = this._toEncodable$1(object);
           if (!this.writeJsonValue$1(customJson))
             throw H.wrapException(new P.JsonUnsupportedObjectError(object, null));
           t1 = this._seen;
           if (0 >= t1.length)
-            return H.ioore(t1, 0);
+            return H.ioore(t1, -1);
           t1.pop();
         } catch (exception) {
           t1 = H.unwrapException(exception);
           e = t1;
           throw H.wrapException(new P.JsonUnsupportedObjectError(object, e));
         }
       },
       writeJsonValue$1: function(object) {
         var t1, success;
         if (typeof object === "number") {
-          if (!C.JSNumber_methods.get$isFinite(object))
+          if (!isFinite(object))
             return false;
           this.writeNumber$1(object);
           return true;
         } else if (object === true) {
           this.writeString$1("true");
           return true;
         } else if (object === false) {
           this.writeString$1("false");
           return true;
         } else if (object == null) {
           this.writeString$1("null");
           return true;
         } else if (typeof object === "string") {
           this.writeString$1("\"");
           this.writeStringContent$1(object);
           this.writeString$1("\"");
           return true;
         } else {
           t1 = J.getInterceptor(object);
           if (!!t1.$isList) {
             this._checkCycle$1(object);
             this.writeList$1(object);
-            this._removeSeen$1(object);
+            t1 = this._seen;
+            if (0 >= t1.length)
+              return H.ioore(t1, -1);
+            t1.pop();
             return true;
           } else if (!!t1.$isMap) {
             this._checkCycle$1(object);
             success = this.writeMap$1(object);
-            this._removeSeen$1(object);
+            t1 = this._seen;
+            if (0 >= t1.length)
+              return H.ioore(t1, -1);
+            t1.pop();
             return success;
           } else
             return false;
         }
       },
       writeList$1: function(list) {
         var t1, i;
         this.writeString$1("[");
         t1 = J.getInterceptor$asx(list);
         if (t1.get$length(list) > 0) {
           this.writeObject$1(t1.$index(list, 0));
           for (i = 1; i < t1.get$length(list); ++i) {
             this.writeString$1(",");
             this.writeObject$1(t1.$index(list, i));
           }
         }
         this.writeString$1("]");
       },
       writeMap$1: function(map) {
         var t1, t2, keyValueList, separator, i;
         t1 = {};
         if (map.get$isEmpty(map) === true) {
           this.writeString$1("{}");
           return true;
         }
         t2 = J.$mul$ns(map.get$length(map), 2);
         if (typeof t2 !== "number")
           return H.iae(t2);
-        keyValueList = Array(t2);
-        t1._captured_i_0 = 0;
-        t1._captured_allStringKeys_1 = true;
+        keyValueList = new Array(t2);
+        t1.i = 0;
+        t1.allStringKeys = true;
         map.forEach$1(0, new P._JsonStringifier_writeMap_closure(t1, keyValueList));
-        if (!t1._captured_allStringKeys_1)
+        if (!t1.allStringKeys)
           return false;
         this.writeString$1("{");
         for (t1 = keyValueList.length, separator = "\"", i = 0; i < t1; i += 2, separator = ",\"") {
           this.writeString$1(separator);
           this.writeStringContent$1(keyValueList[i]);
           this.writeString$1("\":");
           t2 = i + 1;
           if (t2 >= t1)
             return H.ioore(keyValueList, t2);
           this.writeObject$1(keyValueList[t2]);
         }
         this.writeString$1("}");
         return true;
       },
       _toEncodable$1: function(arg0) {
         return this._toEncodable.call$1(arg0);
       }
     },
     _JsonStringifier_writeMap_closure: {
-      "^": "Closure:3;_convert$_box_0,_captured_keyValueList_1",
+      "^": "Closure:3;_box_0,keyValueList",
       call$2: [function(key, value) {
         var t1, t2, t3, i, t4;
         if (typeof key !== "string")
-          this._convert$_box_0._captured_allStringKeys_1 = false;
-        t1 = this._captured_keyValueList_1;
-        t2 = this._convert$_box_0;
-        t3 = t2._captured_i_0;
+          this._box_0.allStringKeys = false;
+        t1 = this.keyValueList;
+        t2 = this._box_0;
+        t3 = t2.i;
         i = t3 + 1;
-        t2._captured_i_0 = i;
+        t2.i = i;
         t4 = t1.length;
         if (t3 >= t4)
           return H.ioore(t1, t3);
         t1[t3] = key;
-        t2._captured_i_0 = i + 1;
+        t2.i = i + 1;
         if (i >= t4)
           return H.ioore(t1, i);
         t1[i] = value;
-      }, null, null, 4, 0, null, 13, 8, "call"]
+      }, null, null, 4, 0, null, 17, 6, "call"]
     },
     _JsonStringStringifier: {
-      "^": "_JsonStringifier;_sink,_seen,_toEncodable",
+      "^": "_JsonStringifier;_convert$_sink,_seen,_toEncodable",
       writeNumber$1: function(number) {
-        this._sink._contents += C.JSNumber_methods.toString$0(number);
+        this._convert$_sink.write$1(C.JSNumber_methods.toString$0(number));
       },
       writeString$1: function(string) {
-        this._sink._contents += H.S(string);
+        this._convert$_sink.write$1(string);
       },
       writeStringSlice$3: function(string, start, end) {
-        this._sink._contents += J.substring$2$s(string, start, end);
+        this._convert$_sink.write$1(J.substring$2$s(string, start, end));
       },
       writeCharCode$1: function(charCode) {
-        this._sink._contents += H.Primitives_stringFromCharCode(charCode);
+        this._convert$_sink.writeCharCode$1(charCode);
       },
       static: {_JsonStringStringifier_stringify: function(object, toEncodable, indent) {
-          var output, t1, stringifier;
+          var output, t1;
           output = new P.StringBuffer("");
+          P._JsonStringStringifier_printOn(object, output, toEncodable, indent);
+          t1 = output._contents;
+          return t1.charCodeAt(0) == 0 ? t1 : t1;
+        }, _JsonStringStringifier_printOn: function(object, output, toEncodable, indent) {
+          var t1, stringifier;
           t1 = P.convert___defaultToEncodable$closure();
           stringifier = new P._JsonStringStringifier(output, [], t1);
           stringifier.writeObject$1(object);
-          t1 = output._contents;
-          return t1.charCodeAt(0) == 0 ? t1 : t1;
         }}
     },
     Utf8Codec: {
       "^": "Encoding;_allowMalformed",
       get$encoder: function() {
-        return new P.Utf8Encoder();
+        return C.C_Utf8Encoder;
       }
     },
     Utf8Encoder: {
       "^": "Converter;",
       convert$3: function(string, start, end) {
         var t1, stringLength, t2, $length, t3, encoder;
         t1 = J.getInterceptor$asx(string);
         stringLength = t1.get$length(string);
         P.RangeError_checkValidRange(start, end, stringLength, null, null, null);
         t2 = J.getInterceptor$n(stringLength);
         $length = t2.$sub(stringLength, start);
         t3 = J.getInterceptor($length);
         if (t3.$eq($length, 0))
           return new Uint8Array(0);
         t3 = t3.$mul($length, 3);
         if (typeof t3 !== "number" || Math.floor(t3) !== t3)
           H.throwExpression(P.ArgumentError$("Invalid length " + H.S(t3)));
         t3 = new Uint8Array(t3);
         encoder = new P._Utf8Encoder(0, 0, t3);
         if (encoder._fillBuffer$3(string, start, stringLength) !== stringLength)
           encoder._writeSurrogate$2(t1.codeUnitAt$1(string, t2.$sub(stringLength, 1)), 0);
-        return new Uint8Array(t3.subarray(0, C.NativeUint8List_methods._checkSublistArguments$3(t3, 0, encoder._bufferIndex, t3.length)));
+        return C.NativeUint8List_methods.sublist$2(t3, 0, encoder._bufferIndex);
       },
       convert$1: function(string) {
         return this.convert$3(string, 0, null);
       }
     },
     _Utf8Encoder: {
       "^": "Object;_carry,_bufferIndex,_buffer",
       _writeSurrogate$2: function(leadingSurrogate, nextCodeUnit) {
         var t1, t2, rune, t3, t4;
         t1 = this._buffer;
@@ skipping 98 matching lines @@
         return stringIndex;
       }
     },
     Utf8Decoder: {
       "^": "Converter;_allowMalformed",
       convert$3: function(codeUnits, start, end) {
         var $length, buffer, decoder, t1;
         $length = J.get$length$asx(codeUnits);
         P.RangeError_checkValidRange(start, end, $length, null, null, null);
         buffer = new P.StringBuffer("");
-        decoder = new P._Utf8Decoder(this._allowMalformed, buffer, true, 0, 0, 0);
+        decoder = new P._Utf8Decoder(false, buffer, true, 0, 0, 0);
         decoder.convert$3(codeUnits, start, $length);
         decoder.flush$0();
         t1 = buffer._contents;
         return t1.charCodeAt(0) == 0 ? t1 : t1;
       },
       convert$1: function(codeUnits) {
         return this.convert$3(codeUnits, 0, null);
       }
     },
     _Utf8Decoder: {
-      "^": "Object;_allowMalformed,_stringSink,_isFirstCharacter,_convert$_value,_expectedUnits,_extraUnits",
-      close$0: function(_) {
-        this.flush$0();
-      },
+      "^": "Object;_allowMalformed,_stringSink,_isFirstCharacter,_value,_expectedUnits,_extraUnits",
       flush$0: function() {
-        if (this._expectedUnits > 0) {
-          if (!this._allowMalformed)
-            throw H.wrapException(new P.FormatException("Unfinished UTF-8 octet sequence", null, null));
-          this._stringSink._contents += H.Primitives_stringFromCharCode(65533);
-          this._convert$_value = 0;
-          this._expectedUnits = 0;
-          this._extraUnits = 0;
-        }
+        if (this._expectedUnits > 0)
+          throw H.wrapException(new P.FormatException("Unfinished UTF-8 octet sequence", null, null));
       },
       convert$3: function(codeUnits, startIndex, endIndex) {
-        var value, expectedUnits, extraUnits, t1, t2, t3, t4, t5, i, unit, t6, oneBytes, i0;
-        value = this._convert$_value;
+        var value, expectedUnits, extraUnits, t1, t2, t3, t4, i, unit, t5, oneBytes, i0, i1, t6;
+        value = this._value;
         expectedUnits = this._expectedUnits;
         extraUnits = this._extraUnits;
-        this._convert$_value = 0;
+        this._value = 0;
         this._expectedUnits = 0;
         this._extraUnits = 0;
         t1 = new P._Utf8Decoder_convert_scanOneByteCharacters(endIndex);
         t2 = new P._Utf8Decoder_convert_addSingleBytes(this, codeUnits, startIndex, endIndex);
         $loop$0:
-          for (t3 = this._stringSink, t4 = !this._allowMalformed, t5 = J.getInterceptor$asx(codeUnits), i = startIndex; true; i = i0) {
+          for (t3 = J.getInterceptor$asx(codeUnits), t4 = this._stringSink, i = startIndex; true; i = i1) {
             $multibyte$2:
               if (expectedUnits > 0) {
                 do {
                   if (i === endIndex)
                     break $loop$0;
-                  unit = t5.$index(codeUnits, i);
-                  t6 = J.getInterceptor$n(unit);
-                  if (t6.$and(unit, 192) !== 128) {
-                    if (t4)
-                      throw H.wrapException(new P.FormatException("Bad UTF-8 encoding 0x" + t6.toRadixString$1(unit, 16), null, null));
-                    this._isFirstCharacter = false;
-                    t3._contents += H.Primitives_stringFromCharCode(65533);
-                    expectedUnits = 0;
-                    break $multibyte$2;
-                  } else {
-                    value = (value << 6 | t6.$and(unit, 63)) >>> 0;
+                  unit = t3.$index(codeUnits, i);
+                  t5 = J.getInterceptor$n(unit);
+                  if (t5.$and(unit, 192) !== 128)
+                    throw H.wrapException(new P.FormatException("Bad UTF-8 encoding 0x" + t5.toRadixString$1(unit, 16), null, null));
+                  else {
+                    value = (value << 6 | t5.$and(unit, 63)) >>> 0;
                     --expectedUnits;
                     ++i;
                   }
                 } while (expectedUnits > 0);
-                t6 = extraUnits - 1;
-                if (t6 < 0 || t6 >= 4)
-                  return H.ioore(C.List_127_2047_65535_1114111, t6);
-                if (value <= C.List_127_2047_65535_1114111[t6]) {
-                  if (t4)
-                    throw H.wrapException(new P.FormatException("Overlong encoding of 0x" + C.JSInt_methods.toRadixString$1(value, 16), null, null));
-                  value = 65533;
-                  expectedUnits = 0;
-                  extraUnits = 0;
-                }
-                if (value > 1114111) {
-                  if (t4)
-                    throw H.wrapException(new P.FormatException("Character outside valid Unicode range: 0x" + C.JSInt_methods.toRadixString$1(value, 16), null, null));
-                  value = 65533;
-                }
+                t5 = extraUnits - 1;
+                if (t5 < 0 || t5 >= 4)
+                  return H.ioore(C.List_127_2047_65535_1114111, t5);
+                if (value <= C.List_127_2047_65535_1114111[t5])
+                  throw H.wrapException(new P.FormatException("Overlong encoding of 0x" + C.JSInt_methods.toRadixString$1(value, 16), null, null));
+                if (value > 1114111)
+                  throw H.wrapException(new P.FormatException("Character outside valid Unicode range: 0x" + C.JSInt_methods.toRadixString$1(value, 16), null, null));
                 if (!this._isFirstCharacter || value !== 65279)
-                  t3._contents += H.Primitives_stringFromCharCode(value);
+                  t4._contents += H.Primitives_stringFromCharCode(value);
                 this._isFirstCharacter = false;
               }
-            for (; i < endIndex; i = i0) {
+            for (t5 = i < endIndex; t5;) {
               oneBytes = t1.call$2(codeUnits, i);
               if (J.$gt$n(oneBytes, 0)) {
                 this._isFirstCharacter = false;
                 if (typeof oneBytes !== "number")
                   return H.iae(oneBytes);
                 i0 = i + oneBytes;
                 t2.call$2(i, i0);
                 if (i0 === endIndex)
                   break;
-                i = i0;
-              }
-              i0 = i + 1;
-              unit = t5.$index(codeUnits, i);
+              } else
+                i0 = i;
+              i1 = i0 + 1;
+              unit = t3.$index(codeUnits, i0);
               t6 = J.getInterceptor$n(unit);
-              if (t6.$lt(unit, 0)) {
-                if (t4)
-                  throw H.wrapException(new P.FormatException("Negative UTF-8 code unit: -0x" + J.toRadixString$1$n(t6.$negate(unit), 16), null, null));
-                t3._contents += H.Primitives_stringFromCharCode(65533);
-              } else {
+              if (t6.$lt(unit, 0))
+                throw H.wrapException(new P.FormatException("Negative UTF-8 code unit: -0x" + J.toRadixString$1$n(t6.$negate(unit), 16), null, null));
+              else {
                 if (t6.$and(unit, 224) === 192) {
                   value = t6.$and(unit, 31);
                   expectedUnits = 1;
                   extraUnits = 1;
                   continue $loop$0;
                 }
                 if (t6.$and(unit, 240) === 224) {
                   value = t6.$and(unit, 15);
                   expectedUnits = 2;
                   extraUnits = 2;
                   continue $loop$0;
                 }
                 if (t6.$and(unit, 248) === 240 && t6.$lt(unit, 245)) {
                   value = t6.$and(unit, 7);
                   expectedUnits = 3;
                   extraUnits = 3;
                   continue $loop$0;
                 }
-                if (t4)
-                  throw H.wrapException(new P.FormatException("Bad UTF-8 encoding 0x" + t6.toRadixString$1(unit, 16), null, null));
-                this._isFirstCharacter = false;
-                t3._contents += H.Primitives_stringFromCharCode(65533);
-                value = 65533;
-                expectedUnits = 0;
-                extraUnits = 0;
+                throw H.wrapException(new P.FormatException("Bad UTF-8 encoding 0x" + t6.toRadixString$1(unit, 16), null, null));
               }
             }
             break $loop$0;
           }
         if (expectedUnits > 0) {
-          this._convert$_value = value;
+          this._value = value;
           this._expectedUnits = expectedUnits;
           this._extraUnits = extraUnits;
         }
       }
     },
     _Utf8Decoder_convert_scanOneByteCharacters: {
-      "^": "Closure:42;_captured_endIndex_0",
+      "^": "Closure:43;endIndex",
       call$2: function(units, from) {
         var to, t1, i, unit;
-        to = this._captured_endIndex_0;
+        to = this.endIndex;
         for (t1 = J.getInterceptor$asx(units), i = from; i < to; ++i) {
           unit = t1.$index(units, i);
           if (J.$and$n(unit, 127) !== unit)
             return i - from;
         }
         return to - from;
       }
     },
     _Utf8Decoder_convert_addSingleBytes: {
-      "^": "Closure:43;_convert$_captured_this_1,_captured_codeUnits_2,_captured_startIndex_3,_captured_endIndex_4",
+      "^": "Closure:67;$this,codeUnits,startIndex,endIndex",
       call$2: function(from, to) {
-        this._convert$_captured_this_1._stringSink._contents += P.String_String$fromCharCodes(this._captured_codeUnits_2, from, to);
+        this.$this._stringSink._contents += P.String_String$fromCharCodes(this.codeUnits, from, to);
       }
     }
   }], ["dart.core", "dart:core",, P, {
     "^": "",
     String__stringFromIterable: function(charCodes, start, end) {
       var t1, it, i, list;
       if (start < 0)
         throw H.wrapException(P.RangeError$range(start, 0, J.get$length$asx(charCodes), null, null));
       t1 = end == null;
-      if (!t1 && end < start)
+      if (!t1 && J.$lt$n(end, start))
         throw H.wrapException(P.RangeError$range(end, start, J.get$length$asx(charCodes), null, null));
       it = J.get$iterator$ax(charCodes);
       for (i = 0; i < start; ++i)
         if (!it.moveNext$0())
           throw H.wrapException(P.RangeError$range(start, 0, i, null, null));
       list = [];
       if (t1)
         for (; it.moveNext$0();)
           list.push(it.get$current());
-      else
-        for (i = start; i < end; ++i) {
+      else {
+        if (typeof end !== "number")
+          return H.iae(end);
+        i = start;
+        for (; i < end; ++i) {
           if (!it.moveNext$0())
             throw H.wrapException(P.RangeError$range(end, start, i, null, null));
           list.push(it.get$current());
         }
+      }
       return H.Primitives_stringFromCharCodes(list);
     },
     Error_safeToString: function(object) {
       if (typeof object === "number" || typeof object === "boolean" || null == object)
         return J.toString$0$(object);
       if (typeof object === "string")
         return JSON.stringify(object);
       return P.Error__objectToString(object);
     },
     Error__objectToString: function(object) {
       var t1 = J.getInterceptor(object);
       if (!!t1.$isClosure)
         return t1.toString$0(object);
       return H.Primitives_objectToHumanReadableString(object);
     },
     Exception_Exception: function(message) {
       return new P._Exception(message);
     },
-    List_List$filled: function($length, fill, $E) {
+    List_List$filled: function($length, fill, growable, $E) {
       var result, t1, i;
       result = J.JSArray_JSArray$fixed($length, $E);
       if ($length !== 0 && true)
         for (t1 = result.length, i = 0; i < t1; ++i)
           result[i] = fill;
       return result;
     },
     List_List$from: function(elements, growable, $E) {
       var list, t1;
       list = H.setRuntimeTypeInfo([], [$E]);
       for (t1 = J.get$iterator$ax(elements); t1.moveNext$0();)
         list.push(t1.get$current());
       if (growable)
         return list;
       list.fixed$length = Array;
       return list;
     },
     List_List$generate: function($length, generator, growable, $E) {
-      var result, t1, i;
-      if (growable) {
-        result = H.setRuntimeTypeInfo([], [$E]);
-        C.JSArray_methods.set$length(result, $length);
-      } else {
-        t1 = Array($length);
-        t1.fixed$length = Array;
-        result = H.setRuntimeTypeInfo(t1, [$E]);
-      }
+      var result, i, t1;
+      result = H.setRuntimeTypeInfo([], [$E]);
+      C.JSArray_methods.set$length(result, $length);
       for (i = 0; i < $length; ++i) {
         t1 = generator.call$1(i);
         if (i >= result.length)
           return H.ioore(result, i);
         result[i] = t1;
       }
       return result;
     },
     print: function(object) {
       var line, t1;
       line = H.S(object);
       t1 = $.printToZone;
       if (t1 == null)
         H.printString(line);
       else
         t1.call$1(line);
     },
     RegExp_RegExp: function(source, caseSensitive, multiLine) {
-      return new H.JSSyntaxRegExp(source, H.JSSyntaxRegExp_makeNative(source, multiLine, caseSensitive, false), null, null);
+      return new H.JSSyntaxRegExp(source, H.JSSyntaxRegExp_makeNative(source, multiLine, true, false), null, null);
     },
     String_String$fromCharCodes: function(charCodes, start, end) {
       var len;
       if (charCodes.constructor === Array) {
         len = charCodes.length;
         end = P.RangeError_checkValidRange(start, end, len, null, null, null);
         return H.Primitives_stringFromCharCodes(start > 0 || J.$lt$n(end, len) ? C.JSArray_methods.sublist$2(charCodes, start, end) : charCodes);
       }
+      if (!!J.getInterceptor(charCodes).$isNativeUint8List)
+        return H.Primitives_stringFromNativeUint8List(charCodes, start, P.RangeError_checkValidRange(start, end, charCodes.length, null, null, null));
       return P.String__stringFromIterable(charCodes, start, end);
     },
     String_String$fromCharCode: function(charCode) {
       return H.Primitives_stringFromCharCode(charCode);
     },
     NoSuchMethodError_toString_closure: {
-      "^": "Closure:44;_box_0,_captured_sb_1",
+      "^": "Closure:45;_box_0,sb",
       call$2: [function(key, value) {
         var t1, t2, t3;
-        t1 = this._captured_sb_1;
+        t1 = this.sb;
         t2 = this._box_0;
-        t1._contents += t2._captured_comma_0;
+        t1._contents += t2.comma;
         t3 = t1._contents += H.S(key.get$__internal$_name());
         t1._contents = t3 + ": ";
         t1._contents += H.S(P.Error_safeToString(value));
-        t2._captured_comma_0 = ", ";
-      }, null, null, 4, 0, null, 13, 8, "call"]
+        t2.comma = ", ";
+      }, null, null, 4, 0, null, 17, 6, "call"]
     },
     bool: {
       "^": "Object;"
     },
     "+bool": 0,
     DateTime: {
-      "^": "Object;millisecondsSinceEpoch,isUtc",
+      "^": "Object;_core$_value,isUtc",
       $eq: function(_, other) {
         if (other == null)
           return false;
         if (!(other instanceof P.DateTime))
           return false;
-        return this.millisecondsSinceEpoch === other.millisecondsSinceEpoch && this.isUtc === other.isUtc;
+        return this._core$_value === other._core$_value && this.isUtc === other.isUtc;
       },
       get$hashCode: function(_) {
-        return this.millisecondsSinceEpoch;
+        var t1 = this._core$_value;
+        return (t1 ^ C.JSNumber_methods._shrOtherPositive$1(t1, 30)) & 1073741823;
       },
       toString$0: function(_) {
         var t1, y, m, d, h, min, sec, ms;
         t1 = this.isUtc;
         y = P.DateTime__fourDigits(t1 ? H.Primitives_lazyAsJsDate(this).getUTCFullYear() + 0 : H.Primitives_lazyAsJsDate(this).getFullYear() + 0);
         m = P.DateTime__twoDigits(t1 ? H.Primitives_lazyAsJsDate(this).getUTCMonth() + 1 : H.Primitives_lazyAsJsDate(this).getMonth() + 1);
         d = P.DateTime__twoDigits(t1 ? H.Primitives_lazyAsJsDate(this).getUTCDate() + 0 : H.Primitives_lazyAsJsDate(this).getDate() + 0);
         h = P.DateTime__twoDigits(t1 ? H.Primitives_lazyAsJsDate(this).getUTCHours() + 0 : H.Primitives_lazyAsJsDate(this).getHours() + 0);
         min = P.DateTime__twoDigits(t1 ? H.Primitives_lazyAsJsDate(this).getUTCMinutes() + 0 : H.Primitives_lazyAsJsDate(this).getMinutes() + 0);
         sec = P.DateTime__twoDigits(t1 ? H.Primitives_lazyAsJsDate(this).getUTCSeconds() + 0 : H.Primitives_lazyAsJsDate(this).getSeconds() + 0);
         ms = P.DateTime__threeDigits(t1 ? H.Primitives_lazyAsJsDate(this).getUTCMilliseconds() + 0 : H.Primitives_lazyAsJsDate(this).getMilliseconds() + 0);
         if (t1)
           return y + "-" + m + "-" + d + " " + h + ":" + min + ":" + sec + "." + ms + "Z";
         else
           return y + "-" + m + "-" + d + " " + h + ":" + min + ":" + sec + "." + ms;
       },
       add$1: function(_, duration) {
-        return P.DateTime$fromMillisecondsSinceEpoch(this.millisecondsSinceEpoch + duration.get$inMilliseconds(), this.isUtc);
+        return P.DateTime$_withValue(C.JSNumber_methods.$add(this._core$_value, duration.get$inMilliseconds()), this.isUtc);
       },
-      DateTime$fromMillisecondsSinceEpoch$2$isUtc: function(millisecondsSinceEpoch, isUtc) {
-        if (Math.abs(millisecondsSinceEpoch) > 864e13)
-          throw H.wrapException(P.ArgumentError$(millisecondsSinceEpoch));
+      get$millisecondsSinceEpoch: function() {
+        return this._core$_value;
       },
-      static: {DateTime$fromMillisecondsSinceEpoch: function(millisecondsSinceEpoch, isUtc) {
-          var t1 = new P.DateTime(millisecondsSinceEpoch, isUtc);
-          t1.DateTime$fromMillisecondsSinceEpoch$2$isUtc(millisecondsSinceEpoch, isUtc);
+      DateTime$_withValue$2$isUtc: function(_value, isUtc) {
+        var t1 = this._core$_value;
+        if (!(Math.abs(t1) > 864e13)) {
+          if (Math.abs(t1) === 864e13)
+            ;
+          t1 = false;
+        } else
+          t1 = true;
+        if (t1)
+          throw H.wrapException(P.ArgumentError$(this.get$millisecondsSinceEpoch()));
+      },
+      static: {DateTime$_withValue: function(_value, isUtc) {
+          var t1 = new P.DateTime(_value, isUtc);
+          t1.DateTime$_withValue$2$isUtc(_value, isUtc);
           return t1;
         }, DateTime__fourDigits: function(n) {
           var absN, sign;
           absN = Math.abs(n);
           sign = n < 0 ? "-" : "";
           if (absN >= 1000)
             return "" + n;
           if (absN >= 100)
             return sign + "0" + H.S(absN);
           if (absN >= 10)
@@ skipping 30 matching lines @@
         if (quotient === 0)
           throw H.wrapException(new P.IntegerDivisionByZeroException());
         return new P.Duration(C.JSInt_methods.$tdiv(this._duration, quotient));
       },
       $lt: function(_, other) {
         return this._duration < other.get$_duration();
       },
       $gt: function(_, other) {
         return this._duration > other.get$_duration();
       },
+      $le: function(_, other) {
+        return C.JSInt_methods.$le(this._duration, other.get$_duration());
+      },
       $ge: function(_, other) {
         return this._duration >= other.get$_duration();
       },
       get$inMilliseconds: function() {
         return C.JSInt_methods._tdivFast$1(this._duration, 1000);
       },
       $eq: function(_, other) {
         if (other == null)
           return false;
         if (!(other instanceof P.Duration))
           return false;
         return this._duration === other._duration;
       },
       get$hashCode: function(_) {
         return this._duration & 0x1FFFFFFF;
       },
       toString$0: function(_) {
         var t1, t2, twoDigitMinutes, twoDigitSeconds, sixDigitUs;
         t1 = new P.Duration_toString_twoDigits();
         t2 = this._duration;
         if (t2 < 0)
           return "-" + new P.Duration(-t2).toString$0(0);
         twoDigitMinutes = t1.call$1(C.JSInt_methods.remainder$1(C.JSInt_methods._tdivFast$1(t2, 60000000), 60));
         twoDigitSeconds = t1.call$1(C.JSInt_methods.remainder$1(C.JSInt_methods._tdivFast$1(t2, 1000000), 60));
         sixDigitUs = new P.Duration_toString_sixDigits().call$1(C.JSInt_methods.remainder$1(t2, 1000000));
         return "" + C.JSInt_methods._tdivFast$1(t2, 3600000000) + ":" + H.S(twoDigitMinutes) + ":" + H.S(twoDigitSeconds) + "." + H.S(sixDigitUs);
       },
       $negate: function(_) {
         return new P.Duration(-this._duration);
-      }
+      },
+      static: {Duration$: function(days, hours, microseconds, milliseconds, minutes, seconds) {
+          return new P.Duration(864e8 * days + 3600000000 * hours + 60000000 * minutes + 1000000 * seconds + 1000 * milliseconds + microseconds);
+        }}
     },
     Duration_toString_sixDigits: {
-      "^": "Closure:7;",
+      "^": "Closure:15;",
       call$1: function(n) {
         if (n >= 100000)
           return "" + n;
         if (n >= 10000)
           return "0" + n;
         if (n >= 1000)
           return "00" + n;
         if (n >= 100)
           return "000" + n;
         if (n >= 10)
           return "0000" + n;
         return "00000" + n;
       }
     },
     Duration_toString_twoDigits: {
-      "^": "Closure:7;",
+      "^": "Closure:15;",
       call$1: function(n) {
         if (n >= 10)
           return "" + n;
         return "0" + n;
       }
     },
     Error: {
       "^": "Object;",
       get$stackTrace: function() {
         return H.getTraceFromException(this.$thrownJsError);
@@ skipping 24 matching lines @@
           return prefix;
         explanation = this.get$_errorExplanation();
         errorValue = P.Error_safeToString(this.invalidValue);
         return prefix + explanation + ": " + H.S(errorValue);
       },
       static: {ArgumentError$: function(message) {
           return new P.ArgumentError(false, null, null, message);
         }, ArgumentError$value: function(value, $name, message) {
           return new P.ArgumentError(true, value, $name, message);
         }, ArgumentError$notNull: function($name) {
-          return new P.ArgumentError(true, null, $name, "Must not be null");
+          return new P.ArgumentError(false, null, $name, "Must not be null");
         }}
     },
     RangeError: {
-      "^": "ArgumentError;start>,end<,_hasValue,invalidValue,name,message",
+      "^": "ArgumentError;start,end,_hasValue,invalidValue,name,message",
       get$_errorName: function() {
         return "RangeError";
       },
       get$_errorExplanation: function() {
         var t1, explanation, t2, t3;
         t1 = this.start;
         if (t1 == null) {
           t1 = this.end;
           explanation = t1 != null ? ": Not less than or equal to " + H.S(t1) : "";
         } else {
@@ skipping 40 matching lines @@
               t1 = true;
             if (t1)
               throw H.wrapException(P.RangeError$range(end, start, $length, "end", message));
             return end;
           }
           return $length;
         }}
     },
     IndexError: {
       "^": "ArgumentError;indexable,length>,_hasValue,invalidValue,name,message",
-      get$start: function(_) {
-        return 0;
-      },
-      get$end: function() {
-        return J.$sub$n(this.length, 1);
-      },
       get$_errorName: function() {
         return "RangeError";
       },
       get$_errorExplanation: function() {
-        P.Error_safeToString(this.indexable);
-        var explanation = ": index should be less than " + H.S(this.length);
-        return J.$lt$n(this.invalidValue, 0) ? ": index must not be negative" : explanation;
+        if (J.$lt$n(this.invalidValue, 0))
+          return ": index must not be negative";
+        var t1 = this.length;
+        if (J.$eq$(t1, 0))
+          return ": no indices are valid";
+        return ": index should be less than " + H.S(t1);
       },
       static: {IndexError$: function(invalidValue, indexable, $name, message, $length) {
           var t1 = $length != null ? $length : J.get$length$asx(indexable);
           return new P.IndexError(indexable, t1, true, invalidValue, $name, "Index out of range");
         }}
     },
     NoSuchMethodError: {
       "^": "Error;_core$_receiver,_memberName,_core$_arguments,_namedArguments,_existingArgumentNames",
       toString$0: function(_) {
-        var t1, sb, t2, t3, _i, argument, memberName, receiverText, actualParameters;
+        var t1, sb, t2, t3, _i, argument, receiverText, actualParameters;
         t1 = {};
         sb = new P.StringBuffer("");
-        t1._captured_comma_0 = "";
+        t1.comma = "";
         for (t2 = this._core$_arguments, t3 = t2.length, _i = 0; _i < t3; ++_i) {
           argument = t2[_i];
-          sb._contents += t1._captured_comma_0;
+          sb._contents += t1.comma;
           sb._contents += H.S(P.Error_safeToString(argument));
-          t1._captured_comma_0 = ", ";
+          t1.comma = ", ";
         }
         this._namedArguments.forEach$1(0, new P.NoSuchMethodError_toString_closure(t1, sb));
-        memberName = this._memberName.get$__internal$_name();
         receiverText = P.Error_safeToString(this._core$_receiver);
         actualParameters = H.S(sb);
-        return "NoSuchMethodError: method not found: '" + H.S(memberName) + "'\nReceiver: " + H.S(receiverText) + "\nArguments: [" + actualParameters + "]";
+        return "NoSuchMethodError: method not found: '" + H.S(this._memberName.__internal$_name) + "'\nReceiver: " + H.S(receiverText) + "\nArguments: [" + actualParameters + "]";
       },
       static: {NoSuchMethodError$: function(receiver, memberName, positionalArguments, namedArguments, existingArgumentNames) {
           return new P.NoSuchMethodError(receiver, memberName, positionalArguments, namedArguments, existingArgumentNames);
         }}
     },
     UnsupportedError: {
       "^": "Error;message>",
       toString$0: function(_) {
         return "Unsupported operation: " + this.message;
       }
@@ skipping 182 matching lines @@
     },
     $int: {
       "^": "num;"
     },
     "+int": 0,
     Iterable: {
       "^": "Object;",
       map$1: function(_, f) {
         return H.MappedIterable_MappedIterable(this, f, H.getRuntimeTypeArgument(this, "Iterable", 0), null);
       },
+      where$1: ["super$Iterable$where", function(_, f) {
+        return H.setRuntimeTypeInfo(new H.WhereIterable(this, f), [H.getRuntimeTypeArgument(this, "Iterable", 0)]);
+      }],
       contains$1: function(_, element) {
         var t1;
         for (t1 = this.get$iterator(this); t1.moveNext$0();)
           if (J.$eq$(t1.get$current(), element))
             return true;
         return false;
       },
       forEach$1: function(_, f) {
         var t1;
         for (t1 = this.get$iterator(this); t1.moveNext$0();)
           f.call$1(t1.get$current());
       },
       toList$1$growable: function(_, growable) {
-        return P.List_List$from(this, growable, H.getRuntimeTypeArgument(this, "Iterable", 0));
+        return P.List_List$from(this, true, H.getRuntimeTypeArgument(this, "Iterable", 0));
       },
       toList$0: function($receiver) {
         return this.toList$1$growable($receiver, true);
       },
       get$length: function(_) {
         var it, count;
         it = this.get$iterator(this);
         for (count = 0; it.moveNext$0();)
           ++count;
         return count;
@@ skipping 70 matching lines @@
         return this === other;
       },
       get$hashCode: function(_) {
         return H.Primitives_objectHashCode(this);
       },
       toString$0: ["super$Object$toString", function(_) {
         return H.Primitives_objectToHumanReadableString(this);
       }],
       noSuchMethod$1: function(_, invocation) {
         throw H.wrapException(P.NoSuchMethodError$(this, invocation.get$memberName(), invocation.get$positionalArguments(), invocation.get$namedArguments(), null));
+      },
+      toString: function() {
+        return this.toString$0(this);
       }
     },
     Match: {
       "^": "Object;"
     },
     StackTrace: {
       "^": "Object;"
     },
     String: {
       "^": "Object;"
     },
     "+String": 0,
     StringBuffer: {
       "^": "Object;_contents@",
       get$length: function(_) {
         return this._contents.length;
       },
       get$isEmpty: function(_) {
         return this._contents.length === 0;
       },
       get$isNotEmpty: function(_) {
         return this._contents.length !== 0;
       },
+      write$1: function(obj) {
+        this._contents += H.S(obj);
+      },
+      writeCharCode$1: function(charCode) {
+        this._contents += H.Primitives_stringFromCharCode(charCode);
+      },
       toString$0: function(_) {
         var t1 = this._contents;
         return t1.charCodeAt(0) == 0 ? t1 : t1;
       },
       static: {StringBuffer__writeAll: function(string, objects, separator) {
           var iterator = J.get$iterator$ax(objects);
           if (!iterator.moveNext$0())
             return string;
           if (separator.length === 0) {
             do
               string += H.S(iterator.get$current());
             while (iterator.moveNext$0());
           } else {
             string += H.S(iterator.get$current());
             for (; iterator.moveNext$0();)
               string = string + separator + H.S(iterator.get$current());
           }
           return string;
         }}
     },
     Symbol: {
       "^": "Object;"
     },
     Uri: {
-      "^": "Object;_host,_port,_path,scheme,_userInfo,_query,_fragment,_pathSegments,_queryParameters",
+      "^": "Object;scheme,_userInfo,_host,_port,_path,_query,_fragment,_pathSegments,_queryParameters",
       get$host: function(_) {
         var t1 = this._host;
         if (t1 == null)
           return "";
         if (J.getInterceptor$s(t1).startsWith$1(t1, "["))
           return C.JSString_methods.substring$2(t1, 1, t1.length - 1);
         return t1;
       },
       get$port: function(_) {
         var t1 = this._port;
         if (t1 == null)
           return P.Uri__defaultPort(this.scheme);
         return t1;
       },
       get$pathSegments: function() {
-        var t1, pathToSplit;
-        t1 = this._pathSegments;
-        if (t1 == null) {
-          pathToSplit = this._path;
-          if (pathToSplit.length !== 0 && C.JSString_methods.codeUnitAt$1(pathToSplit, 0) === 47)
-            pathToSplit = C.JSString_methods.substring$1(pathToSplit, 1);
-          t1 = H.setRuntimeTypeInfo(new P.UnmodifiableListView(pathToSplit === "" ? C.List_empty : H.setRuntimeTypeInfo(new H.MappedListIterable(pathToSplit.split("/"), P.core_Uri_decodeComponent$closure()), [null, null]).toList$1$growable(0, false)), [null]);
-          this._pathSegments = t1;
-        }
-        return t1;
+        var result, pathToSplit;
+        result = this._pathSegments;
+        if (result != null)
+          return result;
+        pathToSplit = this._path;
+        if (pathToSplit.length !== 0 && C.JSString_methods.codeUnitAt$1(pathToSplit, 0) === 47)
+          pathToSplit = C.JSString_methods.substring$1(pathToSplit, 1);
+        result = pathToSplit === "" ? C.List_empty : J.JSArray_markUnmodifiableList(P.List_List$from(H.setRuntimeTypeInfo(new H.MappedListIterable(pathToSplit.split("/"), P.core_Uri_decodeComponent$closure()), [null, null]), false, P.String));
+        this._pathSegments = result;
+        return result;
       },
       _mergePaths$2: function(base, reference) {
         var backCount, refStart, baseEnd, newEnd, delta, t1;
         for (backCount = 0, refStart = 0; C.JSString_methods.startsWith$2(reference, "../", refStart);) {
           refStart += 3;
           ++backCount;
         }
         baseEnd = C.JSString_methods.lastIndexOf$1(base, "/");
         while (true) {
           if (!(baseEnd > 0 && backCount > 0))
@@ skipping 53 matching lines @@
         return t1;
       },
       toFilePath$0: function() {
         return this.toFilePath$1$windows(null);
       },
       get$_isPathAbsolute: function() {
         if (this._path.length === 0)
           return false;
         return C.JSString_methods.startsWith$1(this._path, "/");
       },
+      get$data: function(_) {
+        return this.scheme === "data" ? P.UriData_UriData$fromUri(this) : null;
+      },
       toString$0: function(_) {
         var t1, t2, t3, t4;
         t1 = this.scheme;
         t2 = "" !== t1 ? t1 + ":" : "";
         t3 = this._host;
         t4 = t3 == null;
         if (!t4 || C.JSString_methods.startsWith$1(this._path, "//") || t1 === "file") {
           t1 = t2 + "//";
           t2 = this._userInfo;
           if (t2.length !== 0)
@@ skipping 71 matching lines @@
         var t1, t2, t3, t4, t5;
         t1 = new P.Uri_hashCode_combine();
         t2 = this.get$host(this);
         t3 = this.get$port(this);
         t4 = this._query;
         if (t4 == null)
           t4 = "";
         t5 = this._fragment;
         return t1.call$2(this.scheme, t1.call$2(this._userInfo, t1.call$2(t2, t1.call$2(t3, t1.call$2(this._path, t1.call$2(t4, t1.call$2(t5 == null ? "" : t5, 1)))))));
       },
-      static: {Uri__defaultPort: function(scheme) {
+      static: {Uri_Uri: function(fragment, host, path, pathSegments, port, query, queryParameters, scheme, userInfo) {
+          var isFile, t1, t2;
+          scheme = P.Uri__makeScheme(scheme, 0, scheme.length);
+          userInfo = P.Uri__makeUserInfo(userInfo, 0, userInfo.length);
+          host = P.Uri__makeHost(host, 0, host == null ? 0 : J.get$length$asx(host), false);
+          query = P.Uri__makeQuery(query, 0, 0, queryParameters);
+          fragment = P.Uri__makeFragment(fragment, 0, 0);
+          port = P.Uri__makePort(port, scheme);
+          isFile = scheme === "file";
+          if (host == null)
+            t1 = userInfo.length !== 0 || port != null || isFile;
+          else
+            t1 = false;
+          if (t1)
+            host = "";
+          t1 = host == null;
+          t2 = path == null ? 0 : path.length;
+          path = P.Uri__makePath(path, 0, t2, pathSegments, scheme, !t1);
+          return new P.Uri(scheme, userInfo, host, port, scheme.length === 0 && t1 && !C.JSString_methods.startsWith$1(path, "/") ? P.Uri__normalizeRelativePath(path) : P.Uri__removeDotSegments(path), query, fragment, null, null);
+        }, Uri__defaultPort: function(scheme) {
           if (scheme === "http")
             return 80;
           if (scheme === "https")
             return 443;
           return 0;
         }, Uri_parse: function(uri, start, end) {
           var t1, pathStart, state, t2, i, t3, $char, index, path, numberSignIndex, t4, query, fragment;
           t1 = {};
-          t1._captured_end_0 = end;
-          t1._captured_scheme_1 = "";
-          t1._captured_userinfo_2 = "";
-          t1._captured_host_3 = null;
-          t1._captured_port_4 = null;
-          t1._captured_end_0 = J.get$length$asx(uri);
-          t1._captured_index_5 = start;
-          t1._captured_char_6 = -1;
+          t1.end = end;
+          t1.scheme = "";
+          t1.userinfo = "";
+          t1.host = null;
+          t1.port = null;
+          t1.end = J.get$length$asx(uri);
+          t1.index = start;
+          t1.$char = -1;
           t2 = J.getInterceptor$s(uri);
           i = start;
           while (true) {
-            t3 = t1._captured_end_0;
+            t3 = t1.end;
             if (typeof t3 !== "number")
               return H.iae(t3);
             if (!(i < t3)) {
               pathStart = start;
               state = 0;
               break;
             }
             $char = t2.codeUnitAt$1(uri, i);
-            t1._captured_char_6 = $char;
+            t1.$char = $char;
             if ($char === 63 || $char === 35) {
               pathStart = start;
               state = 0;
               break;
             }
             if ($char === 47) {
               state = i === start ? 2 : 1;
               pathStart = start;
               break;
             }
             if ($char === 58) {
               if (i === start)
                 P.Uri__fail(uri, start, "Invalid empty scheme");
-              t1._captured_scheme_1 = P.Uri__makeScheme(uri, start, i);
+              t1.scheme = P.Uri__makeScheme(uri, start, i);
               ++i;
-              if (i === t1._captured_end_0) {
-                t1._captured_char_6 = -1;
+              if (i === t1.end) {
+                t1.$char = -1;
                 state = 0;
               } else {
                 $char = t2.codeUnitAt$1(uri, i);
-                t1._captured_char_6 = $char;
+                t1.$char = $char;
                 if ($char === 63 || $char === 35)
                   state = 0;
                 else
                   state = $char === 47 ? 2 : 1;
               }
               pathStart = i;
               break;
             }
             ++i;
-            t1._captured_char_6 = -1;
+            t1.$char = -1;
           }
-          t1._captured_index_5 = i;
+          t1.index = i;
           if (state === 2) {
             index = i + 1;
-            t1._captured_index_5 = index;
-            if (index === t1._captured_end_0) {
-              t1._captured_char_6 = -1;
+            t1.index = index;
+            if (index === t1.end) {
+              t1.$char = -1;
               state = 0;
             } else {
-              $char = t2.codeUnitAt$1(uri, t1._captured_index_5);
-              t1._captured_char_6 = $char;
+              $char = t2.codeUnitAt$1(uri, t1.index);
+              t1.$char = $char;
               if ($char === 47) {
-                t1._captured_index_5 = J.$add$ns(t1._captured_index_5, 1);
+                t1.index = J.$add$ns(t1.index, 1);
                 new P.Uri_parse_parseAuth(t1, uri, -1).call$0();
-                pathStart = t1._captured_index_5;
+                pathStart = t1.index;
               }
-              t3 = t1._captured_char_6;
+              t3 = t1.$char;
               state = t3 === 63 || t3 === 35 || t3 === -1 ? 0 : 1;
             }
           }
           if (state === 1)
-            for (; index = J.$add$ns(t1._captured_index_5, 1), t1._captured_index_5 = index, J.$lt$n(index, t1._captured_end_0);) {
-              $char = t2.codeUnitAt$1(uri, t1._captured_index_5);
-              t1._captured_char_6 = $char;
+            for (; index = J.$add$ns(t1.index, 1), t1.index = index, J.$lt$n(index, t1.end);) {
+              $char = t2.codeUnitAt$1(uri, t1.index);
+              t1.$char = $char;
               if ($char === 63 || $char === 35)
                 break;
-              t1._captured_char_6 = -1;
+              t1.$char = -1;
             }
-          t3 = t1._captured_host_3;
-          path = P.Uri__makePath(uri, pathStart, t1._captured_index_5, null, t1._captured_scheme_1, t3 != null);
-          t3 = t1._captured_char_6;
+          t3 = t1.host;
+          path = P.Uri__makePath(uri, pathStart, t1.index, null, t1.scheme, t3 != null);
+          t3 = t1.$char;
           if (t3 === 63) {
-            i = J.$add$ns(t1._captured_index_5, 1);
+            i = J.$add$ns(t1.index, 1);
             while (true) {
               t3 = J.getInterceptor$n(i);
-              if (!t3.$lt(i, t1._captured_end_0)) {
+              if (!t3.$lt(i, t1.end)) {
                 numberSignIndex = -1;
                 break;
               }
               if (t2.codeUnitAt$1(uri, i) === 35) {
                 numberSignIndex = i;
                 break;
               }
               i = t3.$add(i, 1);
             }
             t2 = J.getInterceptor$n(numberSignIndex);
             t3 = t2.$lt(numberSignIndex, 0);
-            t4 = t1._captured_index_5;
+            t4 = t1.index;
             if (t3) {
-              query = P.Uri__makeQuery(uri, J.$add$ns(t4, 1), t1._captured_end_0, null);
+              query = P.Uri__makeQuery(uri, J.$add$ns(t4, 1), t1.end, null);
               fragment = null;
             } else {
               query = P.Uri__makeQuery(uri, J.$add$ns(t4, 1), numberSignIndex, null);
-              fragment = P.Uri__makeFragment(uri, t2.$add(numberSignIndex, 1), t1._captured_end_0);
+              fragment = P.Uri__makeFragment(uri, t2.$add(numberSignIndex, 1), t1.end);
             }
           } else {
-            fragment = t3 === 35 ? P.Uri__makeFragment(uri, J.$add$ns(t1._captured_index_5, 1), t1._captured_end_0) : null;
+            fragment = t3 === 35 ? P.Uri__makeFragment(uri, J.$add$ns(t1.index, 1), t1.end) : null;
             query = null;
           }
-          t2 = t1._captured_scheme_1;
-          t3 = t1._captured_userinfo_2;
-          return new P.Uri(t1._captured_host_3, t1._captured_port_4, path, t2, t3, query, fragment, null, null);
+          return new P.Uri(t1.scheme, t1.userinfo, t1.host, t1.port, path, query, fragment, null, null);
         }, Uri__fail: function(uri, index, message) {
           throw H.wrapException(new P.FormatException(message, uri, index));
-        }, Uri_Uri: function(fragment, host, path, pathSegments, port, query, queryParameters, scheme, userInfo) {
-          var isFile, t1, t2;
-          scheme = P.Uri__makeScheme(scheme, 0, scheme.length);
-          userInfo = P.Uri__makeUserInfo(userInfo, 0, userInfo.length);
-          host = P.Uri__makeHost(host, 0, host == null ? 0 : J.get$length$asx(host), false);
-          query = P.Uri__makeQuery(query, 0, 0, queryParameters);
-          fragment = P.Uri__makeFragment(fragment, 0, 0);
-          port = P.Uri__makePort(port, scheme);
-          isFile = scheme === "file";
-          if (host == null)
-            t1 = userInfo.length !== 0 || port != null || isFile;
-          else
-            t1 = false;
-          if (t1)
-            host = "";
-          t1 = host == null;
-          t2 = path == null ? 0 : path.length;
-          path = P.Uri__makePath(path, 0, t2, pathSegments, scheme, !t1);
-          return new P.Uri(host, port, scheme.length === 0 && t1 && !C.JSString_methods.startsWith$1(path, "/") ? P.Uri__normalizeRelativePath(path) : P.Uri__removeDotSegments(path), scheme, userInfo, query, fragment, null, null);
         }, Uri_Uri$file: function(path, windows) {
           return windows ? P.Uri__makeWindowsFileUrl(path, false) : P.Uri__makeFileUri(path, false);
         }, Uri_base: function() {
           var uri = H.Primitives_currentUri();
           if (uri != null)
             return P.Uri_parse(uri, 0, null);
           throw H.wrapException(new P.UnsupportedError("'Uri.base' is not supported"));
         }, Uri__checkNonWindowsPathReservedCharacters: function(segments, argumentError) {
-          segments.forEach$1(segments, new P.Uri__checkNonWindowsPathReservedCharacters_closure(argumentError));
+          C.JSArray_methods.forEach$1(segments, new P.Uri__checkNonWindowsPathReservedCharacters_closure(false));
         }, Uri__checkWindowsPathReservedCharacters: function(segments, argumentError, firstSegment) {
           var t1;
-          for (t1 = J.skip$1$ax(segments, firstSegment), t1 = new H.ListIterator(t1, t1.get$length(t1), 0, null); t1.moveNext$0();)
-            if (J.contains$1$asx(t1.__internal$_current, new H.JSSyntaxRegExp("[\"*/:<>?\\\\|]", H.JSSyntaxRegExp_makeNative("[\"*/:<>?\\\\|]", false, true, false), null, null)) === true)
+          for (t1 = H.SubListIterable$(segments, firstSegment, null, H.getTypeArgumentByIndex(segments, 0)), t1 = new H.ListIterator(t1, t1.get$length(t1), 0, null); t1.moveNext$0();)
+            if (J.contains$1$asx(t1._current, new H.JSSyntaxRegExp("[\"*/:<>?\\\\|]", H.JSSyntaxRegExp_makeNative("[\"*/:<>?\\\\|]", false, true, false), null, null)) === true)
               if (argumentError)
                 throw H.wrapException(P.ArgumentError$("Illegal character in path"));
               else
                 throw H.wrapException(new P.UnsupportedError("Illegal character in path"));
         }, Uri__checkWindowsDriveLetter: function(charCode, argumentError) {
           var t1;
           if (!(65 <= charCode && charCode <= 90))
             t1 = 97 <= charCode && charCode <= 122;
           else
             t1 = true;
           if (t1)
             return;
           if (argumentError)
             throw H.wrapException(P.ArgumentError$("Illegal drive letter " + P.String_String$fromCharCode(charCode)));
           else
             throw H.wrapException(new P.UnsupportedError("Illegal drive letter " + P.String_String$fromCharCode(charCode)));
         }, Uri__makeFileUri: function(path, slashTerminated) {
           var t1, segments;
           t1 = J.getInterceptor$s(path);
           segments = t1.split$1(path, "/");
-          if (slashTerminated && segments.length !== 0 && J.get$isNotEmpty$asx(C.JSArray_methods.get$last(segments)))
-            C.JSArray_methods.add$1(segments, "");
           if (t1.startsWith$1(path, "/"))
             return P.Uri_Uri(null, null, null, segments, null, null, null, "file", "");
           else
             return P.Uri_Uri(null, null, null, segments, null, null, null, "", "");
         }, Uri__makeWindowsFileUrl: function(path, slashTerminated) {
           var t1, pathSegments, pathStart, hostPart;
           t1 = J.getInterceptor$s(path);
           if (t1.startsWith$1(path, "\\\\?\\"))
             if (t1.startsWith$2(path, "UNC\\", 4))
               path = t1.replaceRange$3(path, 0, 7, "\\");
             else {
               path = t1.substring$1(path, 4);
               if (path.length < 3 || C.JSString_methods.codeUnitAt$1(path, 1) !== 58 || C.JSString_methods.codeUnitAt$1(path, 2) !== 92)
                 throw H.wrapException(P.ArgumentError$("Windows paths with \\\\?\\ prefix must be absolute"));
             }
           else
             path = t1.replaceAll$2(path, "/", "\\");
           t1 = path.length;
           if (t1 > 1 && C.JSString_methods.codeUnitAt$1(path, 1) === 58) {
             P.Uri__checkWindowsDriveLetter(C.JSString_methods.codeUnitAt$1(path, 0), true);
             if (t1 === 2 || C.JSString_methods.codeUnitAt$1(path, 2) !== 92)
               throw H.wrapException(P.ArgumentError$("Windows paths with drive letter must be absolute"));
             pathSegments = path.split("\\");
-            if (slashTerminated && J.get$isNotEmpty$asx(C.JSArray_methods.get$last(pathSegments)))
-              pathSegments.push("");
             P.Uri__checkWindowsPathReservedCharacters(pathSegments, true, 1);
             return P.Uri_Uri(null, null, null, pathSegments, null, null, null, "file", "");
           }
           if (C.JSString_methods.startsWith$1(path, "\\"))
             if (C.JSString_methods.startsWith$2(path, "\\", 1)) {
               pathStart = C.JSString_methods.indexOf$2(path, "\\", 2);
               t1 = pathStart < 0;
               hostPart = t1 ? C.JSString_methods.substring$1(path, 2) : C.JSString_methods.substring$2(path, 2, pathStart);
               pathSegments = (t1 ? "" : C.JSString_methods.substring$1(path, pathStart + 1)).split("\\");
               P.Uri__checkWindowsPathReservedCharacters(pathSegments, true, 0);
-              if (slashTerminated && J.get$isNotEmpty$asx(C.JSArray_methods.get$last(pathSegments)))
-                pathSegments.push("");
               return P.Uri_Uri(null, hostPart, null, pathSegments, null, null, null, "file", "");
             } else {
               pathSegments = path.split("\\");
-              if (slashTerminated && J.get$isNotEmpty$asx(C.JSArray_methods.get$last(pathSegments)))
-                pathSegments.push("");
               P.Uri__checkWindowsPathReservedCharacters(pathSegments, true, 0);
               return P.Uri_Uri(null, null, null, pathSegments, null, null, null, "file", "");
             }
           else {
             pathSegments = path.split("\\");
             P.Uri__checkWindowsPathReservedCharacters(pathSegments, true, 0);
-            if (slashTerminated && pathSegments.length !== 0 && J.get$isNotEmpty$asx(C.JSArray_methods.get$last(pathSegments)))
-              pathSegments.push("");
             return P.Uri_Uri(null, null, null, pathSegments, null, null, null, "", "");
           }
         }, Uri__makePort: function(port, scheme) {
           if (port != null && port === P.Uri__defaultPort(scheme))
             return;
           return port;
         }, Uri__makeHost: function(host, start, end, strictIPv6) {
           var t1, t2, t3, i;
           if (host == null)
             return;
@@ skipping 99 matching lines @@
           }
           if (buffer == null)
             return t1.substring$2(host, start, end);
           if (J.$lt$n(sectionStart, end)) {
             slice = t1.substring$2(host, sectionStart, end);
             buffer._contents += !isNormalized ? slice.toLowerCase() : slice;
           }
           t1 = buffer._contents;
           return t1.charCodeAt(0) == 0 ? t1 : t1;
         }, Uri__makeScheme: function(scheme, start, end) {
-          var t1, firstCodeUnit, t2, i, containsUpperCase, codeUnit;
+          var t1, lowerCase, i, containsUpperCase, codeUnit, t2;
           if (start === end)
             return "";
           t1 = J.getInterceptor$s(scheme);
-          firstCodeUnit = t1.codeUnitAt$1(scheme, start);
-          if (!(firstCodeUnit >= 97 && firstCodeUnit <= 122))
-            t2 = firstCodeUnit >= 65 && firstCodeUnit <= 90;
-          else
-            t2 = true;
-          if (!t2)
+          lowerCase = t1.codeUnitAt$1(scheme, start) | 32;
+          if (!(97 <= lowerCase && lowerCase <= 122))
             P.Uri__fail(scheme, start, "Scheme not starting with alphabetic character");
           if (typeof end !== "number")
             return H.iae(end);
           i = start;
           containsUpperCase = false;
           for (; i < end; ++i) {
             codeUnit = t1.codeUnitAt$1(scheme, i);
             if (codeUnit < 128) {
               t2 = codeUnit >>> 4;
               if (t2 >= 8)
@@ skipping 43 matching lines @@
           t1 = {};
           t2 = query == null;
           if (t2 && true)
             return;
           t2 = !t2;
           if (t2)
             ;
           if (t2)
             return P.Uri__normalize(query, start, end, C.List_CVk);
           result = new P.StringBuffer("");
-          t1._captured_first_0 = true;
+          t1.first = true;
           C.JSNull_methods.forEach$1(queryParameters, new P.Uri__makeQuery_closure(t1, result));
           t1 = result._contents;
           return t1.charCodeAt(0) == 0 ? t1 : t1;
         }, Uri__makeFragment: function(fragment, start, end) {
           if (fragment == null)
             return;
           return P.Uri__normalize(fragment, start, end, C.List_CVk);
-        }, Uri__isHexDigit: function($char) {
-          if (57 >= $char)
-            return 48 <= $char;
-          $char |= 32;
-          return 97 <= $char && 102 >= $char;
-        }, Uri__hexValue: function($char) {
-          if (57 >= $char)
-            return $char - 48;
-          return ($char | 32) - 87;
         }, Uri__normalizeEscape: function(source, index, lowerCase) {
-          var t1, t2, firstDigit, secondDigit, value, t3;
+          var t1, t2, firstDigit, secondDigit, firstDigitValue, secondDigitValue, value, t3;
           t1 = J.getInterceptor$ns(index);
           t2 = J.getInterceptor$asx(source);
           if (J.$ge$n(t1.$add(index, 2), t2.get$length(source)))
             return "%";
           firstDigit = t2.codeUnitAt$1(source, t1.$add(index, 1));
           secondDigit = t2.codeUnitAt$1(source, t1.$add(index, 2));
-          if (!P.Uri__isHexDigit(firstDigit) || !P.Uri__isHexDigit(secondDigit))
+          firstDigitValue = P.Uri__parseHexDigit(firstDigit);
+          secondDigitValue = P.Uri__parseHexDigit(secondDigit);
+          if (firstDigitValue < 0 || secondDigitValue < 0)
             return "%";
-          value = P.Uri__hexValue(firstDigit) * 16 + P.Uri__hexValue(secondDigit);
+          value = firstDigitValue * 16 + secondDigitValue;
           if (value < 127) {
             t3 = C.JSInt_methods._shrOtherPositive$1(value, 4);
             if (t3 >= 8)
               return H.ioore(C.List_nxB, t3);
             t3 = (C.List_nxB[t3] & C.JSInt_methods._shlPositive$1(1, value & 15)) !== 0;
           } else
             t3 = false;
           if (t3)
             return H.Primitives_stringFromCharCode(lowerCase && 65 <= value && 90 >= value ? (value | 32) >>> 0 : value);
           if (firstDigit >= 97 || secondDigit >= 97)
             return t2.substring$2(source, index, t1.$add(index, 3)).toUpperCase();
           return;
+        }, Uri__parseHexDigit: function($char) {
+          var digit, lowerCase;
+          digit = $char ^ 48;
+          if (digit <= 9)
+            return digit;
+          lowerCase = $char | 32;
+          if (97 <= lowerCase && lowerCase <= 102)
+            return lowerCase - 87;
+          return -1;
         }, Uri__escapeChar: function($char) {
           var codeUnits, flag, encodedBytes, t1, index, $byte, t2, t3;
           if ($char < 128) {
-            codeUnits = Array(3);
+            codeUnits = new Array(3);
             codeUnits.fixed$length = Array;
             codeUnits[0] = 37;
             codeUnits[1] = C.JSString_methods.codeUnitAt$1("0123456789ABCDEF", $char >>> 4);
             codeUnits[2] = C.JSString_methods.codeUnitAt$1("0123456789ABCDEF", $char & 15);
           } else {
             if ($char > 2047)
               if ($char > 65535) {
                 flag = 240;
                 encodedBytes = 4;
               } else {
                 flag = 224;
                 encodedBytes = 3;
               }
             else {
               flag = 192;
               encodedBytes = 2;
             }
             t1 = 3 * encodedBytes;
-            codeUnits = Array(t1);
+            codeUnits = new Array(t1);
             codeUnits.fixed$length = Array;
             for (index = 0; --encodedBytes, encodedBytes >= 0; flag = 128) {
               $byte = C.JSInt_methods._shrReceiverPositive$1($char, 6 * encodedBytes) & 63 | flag;
               if (index >= t1)
                 return H.ioore(codeUnits, index);
               codeUnits[index] = 37;
               t2 = index + 1;
               t3 = C.JSString_methods.codeUnitAt$1("0123456789ABCDEF", $byte >>> 4);
               if (t2 >= t1)
                 return H.ioore(codeUnits, t2);
@@ skipping 83 matching lines @@
           var output, t1, t2, appendSlash, _i, segment, t3;
           if (!P.Uri__mayContainDotSegments(path))
             return path;
           output = [];
           for (t1 = path.split("/"), t2 = t1.length, appendSlash = false, _i = 0; _i < t1.length; t1.length === t2 || (0, H.throwConcurrentModificationError)(t1), ++_i) {
             segment = t1[_i];
             if (J.$eq$(segment, "..")) {
               t3 = output.length;
               if (t3 !== 0) {
                 if (0 >= t3)
-                  return H.ioore(output, 0);
+                  return H.ioore(output, -1);
                 output.pop();
                 if (output.length === 0)
                   output.push("");
               }
               appendSlash = true;
             } else if ("." === segment)
               appendSlash = true;
             else {
               output.push(segment);
               appendSlash = false;
             }
           }
           if (appendSlash)
             output.push("");
           return C.JSArray_methods.join$1(output, "/");
         }, Uri__normalizeRelativePath: function(path) {
           var output, t1, t2, appendSlash, _i, segment;
           if (!P.Uri__mayContainDotSegments(path))
             return path;
           output = [];
           for (t1 = path.split("/"), t2 = t1.length, appendSlash = false, _i = 0; _i < t1.length; t1.length === t2 || (0, H.throwConcurrentModificationError)(t1), ++_i) {
             segment = t1[_i];
             if (".." === segment)
               if (output.length !== 0 && !J.$eq$(C.JSArray_methods.get$last(output), "..")) {
                 if (0 >= output.length)
-                  return H.ioore(output, 0);
+                  return H.ioore(output, -1);
                 output.pop();
                 appendSlash = true;
               } else {
                 output.push("..");
                 appendSlash = false;
               }
             else if ("." === segment)
               appendSlash = true;
             else {
               output.push(segment);
               appendSlash = false;
             }
           }
           t1 = output.length;
           if (t1 !== 0)
             if (t1 === 1) {
               if (0 >= t1)
                 return H.ioore(output, 0);
               t1 = J.get$isEmpty$asx(output[0]) === true;
             } else
               t1 = false;
           else
             t1 = true;
           if (t1)
             return "./";
           if (appendSlash || J.$eq$(C.JSArray_methods.get$last(output), ".."))
             output.push("");
           return C.JSArray_methods.join$1(output, "/");
         }, Uri_decodeComponent: [function(encodedComponent) {
-          return P.Uri__uriDecode(encodedComponent, C.Utf8Codec_false, false);
-        }, "call$1", "core_Uri_decodeComponent$closure", 2, 0, 67, 38], Uri_splitQueryString: function(query, encoding) {
+          return P.Uri__uriDecode(encodedComponent, 0, J.get$length$asx(encodedComponent), C.Utf8Codec_false, false);
+        }, "call$1", "core_Uri_decodeComponent$closure", 2, 0, 66, 38], Uri_splitQueryString: function(query, encoding) {
           return C.JSArray_methods.fold$2(query.split("&"), P.LinkedHashMap__makeEmpty(), new P.Uri_splitQueryString_closure(encoding));
         }, Uri_parseIPv4Address: function(host) {
           var t1, bytes;
           t1 = new P.Uri_parseIPv4Address_error();
           bytes = host.split(".");
           if (bytes.length !== 4)
             t1.call$1("IPv4 address should contain exactly 4 parts");
           return H.setRuntimeTypeInfo(new H.MappedListIterable(bytes, new P.Uri_parseIPv4Address_closure(t1)), [null, null]).toList$0(0);
         }, Uri_parseIPv6Address: function(host, start, end) {
           var error, parseHex, parts, partStart, last, i, wildcardSeen, t1, atEnd, isLastWildcard, exception, t2, bytes, index, value, wildCardLength, j;
@@ skipping 49 matching lines @@
               } catch (exception) {
                 H.unwrapException(exception);
                 error.call$2("invalid end of IPv6 address.", partStart);
               }
             }
           if (wildcardSeen) {
             if (J.get$length$asx(parts) > 7)
               error.call$1("an address with a wildcard must have less than 7 parts");
           } else if (J.get$length$asx(parts) !== 8)
             error.call$1("an address without a wildcard must contain exactly 8 parts");
-          bytes = Array(16);
-          bytes.$builtinTypeInfo = [P.$int];
+          bytes = H.setRuntimeTypeInfo(new Array(16), [P.$int]);
           i = 0;
           index = 0;
           while (true) {
             t1 = J.get$length$asx(parts);
             if (typeof t1 !== "number")
               return H.iae(t1);
             if (!(i < t1))
               break;
             value = J.$index$asx(parts, i);
             t1 = J.getInterceptor(value);
@@ skipping 18 matching lines @@
               t1 = t1.$and(value, 255);
               if (t2 >= 16)
                 return H.ioore(bytes, t2);
               bytes[t2] = t1;
               index += 2;
             }
             ++i;
           }
           return bytes;
         }, Uri__uriEncode: function(canonicalTable, text, encoding, spaceToPlus) {
-          var t1, result, bytes, t2, i, $byte, t3;
-          t1 = new P.Uri__uriEncode_byteToHex();
+          var result, bytes, t1, i, t2, $byte, t3;
+          if (encoding === C.Utf8Codec_false && $.$get$Uri__needsNoEncoding()._nativeRegExp.test(H.checkString(text)))
+            return text;
           result = new P.StringBuffer("");
           bytes = encoding.get$encoder().convert$1(text);
-          for (t2 = bytes.length, i = 0; i < t2; ++i) {
+          for (t1 = bytes.length, i = 0, t2 = ""; i < t1; ++i) {
             $byte = bytes[i];
             if ($byte < 128) {
               t3 = $byte >>> 4;
               if (t3 >= 8)
                 return H.ioore(canonicalTable, t3);
               t3 = (canonicalTable[t3] & C.JSInt_methods._shlPositive$1(1, $byte & 15)) !== 0;
             } else
               t3 = false;
             if (t3)
-              result._contents += H.Primitives_stringFromCharCode($byte);
-            else if (spaceToPlus && $byte === 32)
-              result._contents += H.Primitives_stringFromCharCode(43);
-            else {
-              result._contents += H.Primitives_stringFromCharCode(37);
-              t1.call$2($byte, result);
+              t2 = result._contents += H.Primitives_stringFromCharCode($byte);
+            else if (spaceToPlus && $byte === 32) {
+              t2 += "+";
+              result._contents = t2;
+            } else {
+              t2 += "%";
+              result._contents = t2;
+              t2 += "0123456789ABCDEF"[$byte >>> 4 & 15];
+              result._contents = t2;
+              t2 += "0123456789ABCDEF"[$byte & 15];
+              result._contents = t2;
             }
           }
-          t1 = result._contents;
-          return t1.charCodeAt(0) == 0 ? t1 : t1;
+          return t2.charCodeAt(0) == 0 ? t2 : t2;
         }, Uri__hexCharPairToByte: function(s, pos) {
           var t1, $byte, i, charCode;
           for (t1 = J.getInterceptor$s(s), $byte = 0, i = 0; i < 2; ++i) {
             charCode = t1.codeUnitAt$1(s, pos + i);
             if (48 <= charCode && charCode <= 57)
               $byte = $byte * 16 + charCode - 48;
             else {
               charCode |= 32;
               if (97 <= charCode && charCode <= 102)
                 $byte = $byte * 16 + charCode - 87;
               else
                 throw H.wrapException(P.ArgumentError$("Invalid URL encoding"));
             }
           }
           return $byte;
-        }, Uri__uriDecode: function(text, encoding, plusToSpace) {
-          var t1, simple, i, t2, codeUnit, bytes;
+        }, Uri__uriDecode: function(text, start, end, encoding, plusToSpace) {
+          var t1, i, simple, codeUnit, t2, bytes;
+          if (typeof end !== "number")
+            return H.iae(end);
           t1 = J.getInterceptor$asx(text);
-          simple = true;
-          i = 0;
+          i = start;
           while (true) {
-            t2 = t1.get$length(text);
-            if (typeof t2 !== "number")
-              return H.iae(t2);
-            if (!(i < t2 && simple))
+            if (!(i < end)) {
+              simple = true;
               break;
+            }
             codeUnit = t1.codeUnitAt$1(text, i);
-            simple = codeUnit !== 37 && codeUnit !== 43;
+            if (codeUnit <= 127)
+              if (codeUnit !== 37)
+                t2 = plusToSpace && codeUnit === 43;
+              else
+                t2 = true;
+            else
+              t2 = true;
+            if (t2) {
+              simple = false;
+              break;
+            }
             ++i;
           }
-          if (simple)
-            if (encoding === C.Utf8Codec_false || false)
-              return text;
+          if (simple) {
+            if (C.Utf8Codec_false !== encoding)
+              t2 = false;
             else
-              bytes = t1.get$codeUnits(text);
-          else {
+              t2 = true;
+            if (t2)
+              return t1.substring$2(text, start, end);
+            else
+              bytes = new H.CodeUnits(t1.substring$2(text, start, end));
+          } else {
             bytes = [];
-            i = 0;
-            while (true) {
-              t2 = t1.get$length(text);
-              if (typeof t2 !== "number")
-                return H.iae(t2);
-              if (!(i < t2))
-                break;
+            for (i = start; i < end; ++i) {
               codeUnit = t1.codeUnitAt$1(text, i);
               if (codeUnit > 127)
                 throw H.wrapException(P.ArgumentError$("Illegal percent encoding in URI"));
               if (codeUnit === 37) {
                 t2 = t1.get$length(text);
                 if (typeof t2 !== "number")
                   return H.iae(t2);
                 if (i + 3 > t2)
                   throw H.wrapException(P.ArgumentError$("Truncated URI"));
                 bytes.push(P.Uri__hexCharPairToByte(text, i + 1));
                 i += 2;
               } else if (plusToSpace && codeUnit === 43)
                 bytes.push(32);
               else
                 bytes.push(codeUnit);
-              ++i;
             }
           }
-          return new P.Utf8Decoder(encoding._allowMalformed).convert$1(bytes);
+          return new P.Utf8Decoder(false).convert$1(bytes);
         }}
     },
     Uri_parse_parseAuth: {
-      "^": "Closure:2;_box_0,_captured_uri_1,_captured_EOI_2",
+      "^": "Closure:2;_box_0,uri,EOI",
       call$0: function() {
         var t1, authStart, t2, t3, $char, lastColon, lastAt, char0, endBracket, hostEnd, t4, hostStart, i, portNumber, digit;
         t1 = this._box_0;
-        if (J.$eq$(t1._captured_index_5, t1._captured_end_0)) {
-          t1._captured_char_6 = this._captured_EOI_2;
+        if (J.$eq$(t1.index, t1.end)) {
+          t1.$char = this.EOI;
           return;
         }
-        authStart = t1._captured_index_5;
-        t2 = this._captured_uri_1;
+        authStart = t1.index;
+        t2 = this.uri;
         t3 = J.getInterceptor$s(t2);
-        t1._captured_char_6 = t3.codeUnitAt$1(t2, authStart);
-        for ($char = this._captured_EOI_2, lastColon = -1, lastAt = -1; J.$lt$n(t1._captured_index_5, t1._captured_end_0);) {
-          char0 = t3.codeUnitAt$1(t2, t1._captured_index_5);
-          t1._captured_char_6 = char0;
+        t1.$char = t3.codeUnitAt$1(t2, authStart);
+        for ($char = this.EOI, lastColon = -1, lastAt = -1; J.$lt$n(t1.index, t1.end);) {
+          char0 = t3.codeUnitAt$1(t2, t1.index);
+          t1.$char = char0;
           if (char0 === 47 || char0 === 63 || char0 === 35)
             break;
           if (char0 === 64) {
-            lastAt = t1._captured_index_5;
+            lastAt = t1.index;
             lastColon = -1;
           } else if (char0 === 58)
-            lastColon = t1._captured_index_5;
+            lastColon = t1.index;
           else if (char0 === 91) {
-            endBracket = t3.indexOf$2(t2, "]", J.$add$ns(t1._captured_index_5, 1));
+            endBracket = t3.indexOf$2(t2, "]", J.$add$ns(t1.index, 1));
             if (J.$eq$(endBracket, -1)) {
-              t1._captured_index_5 = t1._captured_end_0;
-              t1._captured_char_6 = $char;
+              t1.index = t1.end;
+              t1.$char = $char;
               lastColon = -1;
               break;
             } else
-              t1._captured_index_5 = endBracket;
+              t1.index = endBracket;
             lastColon = -1;
           }
-          t1._captured_index_5 = J.$add$ns(t1._captured_index_5, 1);
-          t1._captured_char_6 = $char;
+          t1.index = J.$add$ns(t1.index, 1);
+          t1.$char = $char;
         }
-        hostEnd = t1._captured_index_5;
+        hostEnd = t1.index;
         t4 = J.getInterceptor$n(lastAt);
         if (t4.$ge(lastAt, 0)) {
-          t1._captured_userinfo_2 = P.Uri__makeUserInfo(t2, authStart, lastAt);
+          t1.userinfo = P.Uri__makeUserInfo(t2, authStart, lastAt);
           hostStart = t4.$add(lastAt, 1);
         } else
           hostStart = authStart;
         t4 = J.getInterceptor$n(lastColon);
         if (t4.$ge(lastColon, 0)) {
-          if (J.$lt$n(t4.$add(lastColon, 1), t1._captured_index_5))
-            for (i = t4.$add(lastColon, 1), portNumber = 0; t4 = J.getInterceptor$n(i), t4.$lt(i, t1._captured_index_5); i = t4.$add(i, 1)) {
+          if (J.$lt$n(t4.$add(lastColon, 1), t1.index))
+            for (i = t4.$add(lastColon, 1), portNumber = 0; t4 = J.getInterceptor$n(i), t4.$lt(i, t1.index); i = t4.$add(i, 1)) {
               digit = t3.codeUnitAt$1(t2, i);
               if (48 > digit || 57 < digit)
                 P.Uri__fail(t2, i, "Invalid port number");
               portNumber = portNumber * 10 + (digit - 48);
             }
           else
             portNumber = null;
-          t1._captured_port_4 = P.Uri__makePort(portNumber, t1._captured_scheme_1);
+          t1.port = P.Uri__makePort(portNumber, t1.scheme);
           hostEnd = lastColon;
         }
-        t1._captured_host_3 = P.Uri__makeHost(t2, hostStart, hostEnd, true);
-        if (J.$lt$n(t1._captured_index_5, t1._captured_end_0))
-          t1._captured_char_6 = t3.codeUnitAt$1(t2, t1._captured_index_5);
+        t1.host = P.Uri__makeHost(t2, hostStart, hostEnd, true);
+        if (J.$lt$n(t1.index, t1.end))
+          t1.$char = t3.codeUnitAt$1(t2, t1.index);
       }
     },
     Uri__checkNonWindowsPathReservedCharacters_closure: {
-      "^": "Closure:0;_captured_argumentError_0",
+      "^": "Closure:0;argumentError",
       call$1: function(segment) {
         if (J.contains$1$asx(segment, "/") === true)
-          if (this._captured_argumentError_0)
+          if (this.argumentError)
             throw H.wrapException(P.ArgumentError$("Illegal path character " + H.S(segment)));
           else
             throw H.wrapException(new P.UnsupportedError("Illegal path character " + H.S(segment)));
       }
     },
     Uri__makePath_closure: {
       "^": "Closure:0;",
       call$1: [function(s) {
         return P.Uri__uriEncode(C.List_qg40, s, C.Utf8Codec_false, false);
-      }, null, null, 2, 0, null, 24, "call"]
+      }, null, null, 2, 0, null, 39, "call"]
     },
     Uri__makeQuery_closure: {
-      "^": "Closure:3;_box_0,_core$_captured_result_1",
+      "^": "Closure:3;_box_0,result",
       call$2: function(key, value) {
         var t1 = this._box_0;
-        if (!t1._captured_first_0)
-          this._core$_captured_result_1._contents += "&";
-        t1._captured_first_0 = false;
-        t1 = this._core$_captured_result_1;
-        t1._contents += P.Uri__uriEncode(C.List_nxB, key, C.Utf8Codec_false, true);
+        if (!t1.first)
+          this.result._contents += "&";
+        t1.first = false;
+        t1 = this.result;
+        t1._contents += H.S(P.Uri__uriEncode(C.List_nxB, key, C.Utf8Codec_false, true));
         if (!value.get$isEmpty(value)) {
           t1._contents += "=";
-          t1._contents += P.Uri__uriEncode(C.List_nxB, value, C.Utf8Codec_false, true);
+          t1._contents += H.S(P.Uri__uriEncode(C.List_nxB, value, C.Utf8Codec_false, true));
         }
       }
     },
     Uri_hashCode_combine: {
-      "^": "Closure:46;",
+      "^": "Closure:47;",
       call$2: function(part, current) {
         return current * 31 + J.get$hashCode$(part) & 1073741823;
       }
     },
     Uri_splitQueryString_closure: {
-      "^": "Closure:3;_captured_encoding_0",
+      "^": "Closure:3;encoding",
       call$2: function(map, element) {
         var t1, index, t2, key, value;
         t1 = J.getInterceptor$asx(element);
         index = t1.indexOf$1(element, "=");
         t2 = J.getInterceptor(index);
         if (t2.$eq(index, -1)) {
           if (!t1.$eq(element, ""))
-            J.$indexSet$ax(map, P.Uri__uriDecode(element, this._captured_encoding_0, true), "");
+            J.$indexSet$ax(map, P.Uri__uriDecode(element, 0, t1.get$length(element), this.encoding, true), "");
         } else if (!t2.$eq(index, 0)) {
           key = t1.substring$2(element, 0, index);
           value = t1.substring$1(element, t2.$add(index, 1));
-          t1 = this._captured_encoding_0;
-          J.$indexSet$ax(map, P.Uri__uriDecode(key, t1, true), P.Uri__uriDecode(value, t1, true));
+          t1 = this.encoding;
+          J.$indexSet$ax(map, P.Uri__uriDecode(key, 0, key.length, t1, true), P.Uri__uriDecode(value, 0, value.length, t1, true));
         }
         return map;
       }
     },
     Uri_parseIPv4Address_error: {
-      "^": "Closure:6;",
+      "^": "Closure:7;",
       call$1: function(msg) {
         throw H.wrapException(new P.FormatException("Illegal IPv4 address, " + msg, null, null));
       }
     },
     Uri_parseIPv4Address_closure: {
-      "^": "Closure:0;_core$_captured_error_0",
+      "^": "Closure:0;error",
       call$1: [function(byteString) {
         var $byte, t1;
         $byte = H.Primitives_parseInt(byteString, null, null);
         t1 = J.getInterceptor$n($byte);
         if (t1.$lt($byte, 0) || t1.$gt($byte, 255))
-          this._core$_captured_error_0.call$1("each part must be in the range of `0..255`");
+          this.error.call$1("each part must be in the range of `0..255`");
         return $byte;
-      }, null, null, 2, 0, null, 39, "call"]
+      }, null, null, 2, 0, null, 40, "call"]
     },
     Uri_parseIPv6Address_error: {
-      "^": "Closure:47;_captured_host_0",
+      "^": "Closure:48;host",
       call$2: function(msg, position) {
-        throw H.wrapException(new P.FormatException("Illegal IPv6 address, " + msg, this._captured_host_0, position));
+        throw H.wrapException(new P.FormatException("Illegal IPv6 address, " + msg, this.host, position));
       },
       call$1: function(msg) {
         return this.call$2(msg, null);
       }
     },
     Uri_parseIPv6Address_parseHex: {
-      "^": "Closure:48;_captured_host_1,_captured_error_2",
+      "^": "Closure:49;host,error",
       call$2: function(start, end) {
         var value, t1;
         if (J.$gt$n(J.$sub$n(end, start), 4))
-          this._captured_error_2.call$2("an IPv6 part can only contain a maximum of 4 hex digits", start);
-        value = H.Primitives_parseInt(J.substring$2$s(this._captured_host_1, start, end), 16, null);
+          this.error.call$2("an IPv6 part can only contain a maximum of 4 hex digits", start);
+        value = H.Primitives_parseInt(J.substring$2$s(this.host, start, end), 16, null);
         t1 = J.getInterceptor$n(value);
         if (t1.$lt(value, 0) || t1.$gt(value, 65535))
-          this._captured_error_2.call$2("each part must be in the range of `0x0..0xFFFF`", start);
+          this.error.call$2("each part must be in the range of `0x0..0xFFFF`", start);
         return value;
       }
     },
-    Uri__uriEncode_byteToHex: {
-      "^": "Closure:3;",
-      call$2: function($byte, buffer) {
-        var t1 = J.getInterceptor$n($byte);
-        buffer._contents += H.Primitives_stringFromCharCode(C.JSString_methods.codeUnitAt$1("0123456789ABCDEF", t1.$shr($byte, 4)));
-        buffer._contents += H.Primitives_stringFromCharCode(C.JSString_methods.codeUnitAt$1("0123456789ABCDEF", t1.$and($byte, 15)));
-      }
+    UriData: {
+      "^": "Object;_text,_separatorIndices,_uriCache",
+      get$uri: function() {
+        return this._uriCache;
+      },
+      toString$0: function(_) {
+        var t1, t2;
+        t1 = this._separatorIndices;
+        if (0 >= t1.length)
+          return H.ioore(t1, 0);
+        t2 = this._text;
+        return t1[0] === -1 ? "data:" + t2 : t2;
+      },
+      static: {UriData_UriData$fromUri: function(uri) {
+          if (uri.scheme !== "data")
+            throw H.wrapException(P.ArgumentError$value(uri, "uri", "Scheme must be 'data'"));
+          if (uri._host != null)
+            throw H.wrapException(P.ArgumentError$value(uri, "uri", "Data uri must not have authority"));
+          if (uri._fragment != null)
+            throw H.wrapException(P.ArgumentError$value(uri, "uri", "Data uri must not have a fragment part"));
+          if (uri._query == null)
+            return P.UriData__parse(uri._path, 0, uri);
+          return P.UriData__parse(uri.toString$0(0), 5, uri);
+        }, UriData__parse: function(text, start, sourceUri) {
+          var indices, t1, i, slashIndex, $char, equalsIndex, lastSeparator;
+          indices = [start - 1];
+          for (t1 = text.length, i = start, slashIndex = -1, $char = null; i < t1; ++i) {
+            $char = C.JSString_methods.codeUnitAt$1(text, i);
+            if ($char === 44 || $char === 59)
+              break;
+            if ($char === 47) {
+              if (slashIndex < 0) {
+                slashIndex = i;
+                continue;
+              }
+              throw H.wrapException(new P.FormatException("Invalid MIME type", text, i));
+            }
+          }
+          if (slashIndex < 0 && i > start)
+            throw H.wrapException(new P.FormatException("Invalid MIME type", text, i));
+          for (; $char !== 44;) {
+            indices.push(i);
+            ++i;
+            for (equalsIndex = -1; i < t1; ++i) {
+              $char = C.JSString_methods.codeUnitAt$1(text, i);
+              if ($char === 61) {
+                if (equalsIndex < 0)
+                  equalsIndex = i;
+              } else if ($char === 59 || $char === 44)
+                break;
+            }
+            if (equalsIndex >= 0)
+              indices.push(equalsIndex);
+            else {
+              lastSeparator = C.JSArray_methods.get$last(indices);
+              if ($char !== 44 || i !== lastSeparator + 7 || !C.JSString_methods.startsWith$2(text, "base64", lastSeparator + 1))
+                throw H.wrapException(new P.FormatException("Expecting '='", text, i));
+              break;
+            }
+          }
+          indices.push(i);
+          return new P.UriData(text, indices, sourceUri);
+        }}
     }
   }], ["dart.dom.html", "dart:html",, W, {
     "^": "",
     WebSocket_WebSocket: function(url, protocol_OR_protocols) {
       var t1, t2;
       t1 = typeof url !== "string";
       if ((!t1 || url == null) && true)
         return new WebSocket(url);
       t2 = !t1 || url == null;
       if (t2)
@@ skipping 31 matching lines @@
       return removed;
     },
     _convertNativeToDart_Window: function(win) {
       if (win == null)
         return;
       return W._DOMWindowCrossFrame__createSafe(win);
     },
     _wrapZone: function(callback) {
       if (J.$eq$($.Zone__current, C.C__RootZone))
         return callback;
+      if (callback == null)
+        return;
       return $.Zone__current.bindUnaryCallback$2$runGuarded(callback, true);
     },
     HtmlElement: {
       "^": "Element;",
       $isHtmlElement: 1,
       $isElement: 1,
       $isNode: 1,
       $isObject: 1,
-      "%": "HTMLAppletElement|HTMLBRElement|HTMLBaseElement|HTMLButtonElement|HTMLCanvasElement|HTMLContentElement|HTMLDListElement|HTMLDataListElement|HTMLDetailsElement|HTMLDialogElement|HTMLDirectoryElement|HTMLFieldSetElement|HTMLFontElement|HTMLFrameElement|HTMLHRElement|HTMLHeadElement|HTMLHeadingElement|HTMLHtmlElement|HTMLKeygenElement|HTMLLIElement|HTMLLabelElement|HTMLLegendElement|HTMLLinkElement|HTMLMapElement|HTMLMarqueeElement|HTMLMenuElement|HTMLMenuItemElement|HTMLMetaElement|HTMLMeterElement|HTMLModElement|HTMLOptGroupElement|HTMLOptionElement|HTMLOutputElement|HTMLParagraphElement|HTMLParamElement|HTMLPictureElement|HTMLPreElement|HTMLProgressElement|HTMLQuoteElement|HTMLShadowElement|HTMLSpanElement|HTMLStyleElement|HTMLTableCaptionElement|HTMLTableCellElement|HTMLTableColElement|HTMLTableDataCellElement|HTMLTableElement|HTMLTableHeaderCellElement|HTMLTableRowElement|HTMLTableSectionElement|HTMLTemplateElement|HTMLTextAreaElement|HTMLTitleElement|HTMLUListElement|HTMLUnknownElement;HTMLElement"
+      "%": "HTMLAppletElement|HTMLBRElement|HTMLBaseElement|HTMLButtonElement|HTMLCanvasElement|HTMLContentElement|HTMLDListElement|HTMLDataListElement|HTMLDetailsElement|HTMLDialogElement|HTMLDirectoryElement|HTMLFieldSetElement|HTMLFontElement|HTMLFrameElement|HTMLHRElement|HTMLHeadElement|HTMLHeadingElement|HTMLHtmlElement|HTMLKeygenElement|HTMLLIElement|HTMLLabelElement|HTMLLegendElement|HTMLLinkElement|HTMLMapElement|HTMLMarqueeElement|HTMLMenuElement|HTMLMenuItemElement|HTMLMetaElement|HTMLMeterElement|HTMLModElement|HTMLOListElement|HTMLOptGroupElement|HTMLOptionElement|HTMLOutputElement|HTMLParagraphElement|HTMLParamElement|HTMLPictureElement|HTMLPreElement|HTMLProgressElement|HTMLQuoteElement|HTMLShadowElement|HTMLSpanElement|HTMLStyleElement|HTMLTableCaptionElement|HTMLTableCellElement|HTMLTableColElement|HTMLTableDataCellElement|HTMLTableElement|HTMLTableHeaderCellElement|HTMLTableRowElement|HTMLTableSectionElement|HTMLTemplateElement|HTMLTextAreaElement|HTMLTitleElement|HTMLUListElement|HTMLUnknownElement;HTMLElement"
     },
     AnchorElement: {
       "^": "HtmlElement;origin=",
       toString$0: function(receiver) {
         return String(receiver);
       },
       $isInterceptor: 1,
       "%": "HTMLAnchorElement"
     },
     ApplicationCacheErrorEvent: {
       "^": "Event;message=",
       "%": "ApplicationCacheErrorEvent"
     },
     AreaElement: {
       "^": "HtmlElement;origin=",
       toString$0: function(receiver) {
         return String(receiver);
       },
       $isInterceptor: 1,
       "%": "HTMLAreaElement"
     },
     Blob: {
       "^": "Interceptor;",
-      close$0: function(receiver) {
-        return receiver.close();
-      },
       $isBlob: 1,
       "%": ";Blob"
     },
     BodyElement: {
       "^": "HtmlElement;",
       $isInterceptor: 1,
       "%": "HTMLBodyElement"
     },
     CharacterData: {
       "^": "Node;data=,length=",
@@ skipping 28 matching lines @@
       "%": "DOMError|FileError"
     },
     DomException: {
       "^": "Interceptor;message=",
       toString$0: function(receiver) {
         return String(receiver);
       },
       "%": "DOMException"
     },
     DomRectReadOnly: {
-      "^": "Interceptor;bottom=,height=,left=,right=,top=,width=",
+      "^": "Interceptor;height=,left=,top=,width=",
       toString$0: function(receiver) {
         return "Rectangle (" + H.S(receiver.left) + ", " + H.S(receiver.top) + ") " + H.S(this.get$width(receiver)) + " x " + H.S(this.get$height(receiver));
       },
       $eq: function(receiver, other) {
         var t1, t2, t3;
         if (other == null)
           return false;
         t1 = J.getInterceptor(other);
         if (!t1.$isRectangle)
           return false;
@@ skipping 65 matching lines @@
       "^": "Interceptor;",
       stopPropagation$0: function(receiver) {
         return receiver.stopPropagation();
       },
       $isEvent: 1,
       "%": "AnimationPlayerEvent|AudioProcessingEvent|AutocompleteErrorEvent|BeforeUnloadEvent|CloseEvent|CustomEvent|DeviceLightEvent|DeviceMotionEvent|DeviceOrientationEvent|ExtendableEvent|FetchEvent|FontFaceSetLoadEvent|GamepadEvent|HashChangeEvent|IDBVersionChangeEvent|InstallEvent|MIDIConnectionEvent|MediaKeyNeededEvent|MediaQueryListEvent|MediaStreamEvent|MediaStreamTrackEvent|MutationEvent|OfflineAudioCompletionEvent|OverflowEvent|PageTransitionEvent|PopStateEvent|ProgressEvent|RTCDTMFToneChangeEvent|RTCDataChannelEvent|RTCIceCandidateEvent|RTCPeerConnectionIceEvent|RelatedEvent|ResourceProgressEvent|SecurityPolicyViolationEvent|SpeechRecognitionEvent|SpeechSynthesisEvent|StorageEvent|TrackEvent|TransitionEvent|WebGLContextEvent|WebKitAnimationEvent|WebKitTransitionEvent|XMLHttpRequestProgressEvent;ClipboardEvent|Event|InputEvent"
     },
     EventTarget: {
       "^": "Interceptor;",
       _addEventListener$3: function(receiver, type, listener, useCapture) {
-        return receiver.addEventListener(type, H.convertDartClosureToJS(listener, 1), useCapture);
+        return receiver.addEventListener(type, H.convertDartClosureToJS(listener, 1), false);
       },
       _removeEventListener$3: function(receiver, type, listener, useCapture) {
-        return receiver.removeEventListener(type, H.convertDartClosureToJS(listener, 1), useCapture);
+        return receiver.removeEventListener(type, H.convertDartClosureToJS(listener, 1), false);
       },
       "%": "MediaStream;EventTarget"
     },
     File: {
       "^": "Blob;",
       $isFile: 1,
       "%": "File"
     },
     FormElement: {
       "^": "HtmlElement;length=",
@@ skipping 104 matching lines @@
       "^": "Event;message=",
       "%": "MediaKeyEvent"
     },
     MediaKeyMessageEvent: {
       "^": "Event;message=",
       "%": "MediaKeyMessageEvent"
     },
     MessageEvent: {
       "^": "Event;origin=",
       get$data: function(receiver) {
-        return P.convertNativeToDart_AcceptStructuredClone(receiver.data, true);
+        var t1, t2;
+        t1 = receiver.data;
+        t2 = new P._AcceptStructuredCloneDart2Js([], [], false);
+        t2.mustCopy = true;
+        return t2.walk$1(t1);
       },
       "%": "MessageEvent"
     },
     MidiMessageEvent: {
       "^": "Event;data=",
       "%": "MIDIMessageEvent"
     },
     MidiOutput: {
       "^": "MidiPort;",
       send$2: function(receiver, data, timestamp) {
@@ skipping 80 matching lines @@
       $isEfficientLength: 1
     },
     Interceptor_ListMixin_ImmutableListMixin0: {
       "^": "Interceptor_ListMixin0+ImmutableListMixin;",
       $isList: 1,
       $asList: function() {
         return [W.Node];
       },
       $isEfficientLength: 1
     },
-    OListElement: {
-      "^": "HtmlElement;start=",
-      "%": "HTMLOListElement"
-    },
     ObjectElement: {
       "^": "HtmlElement;data=",
       "%": "HTMLObjectElement"
     },
     PluginPlaceholderElement: {
       "^": "DivElement;message=",
       "%": "PluginPlaceholderElement"
     },
     PositionError: {
       "^": "Interceptor;message=",
@@ skipping 26 matching lines @@
     TrackElement: {
       "^": "HtmlElement;src%",
       "%": "HTMLTrackElement"
     },
     UIEvent: {
       "^": "Event;",
       "%": "DragEvent|FocusEvent|MSPointerEvent|MouseEvent|PointerEvent|SVGZoomEvent|TouchEvent|WheelEvent;UIEvent"
     },
     WebSocket: {
       "^": "EventTarget;",
-      close$2: function(receiver, code, reason) {
-        return receiver.close(code, reason);
-      },
-      close$0: function($receiver) {
-        return $receiver.close();
-      },
       send$1: function(receiver, data) {
         return receiver.send(data);
       },
       "%": "WebSocket"
     },
     Window: {
       "^": "EventTarget;",
       get$location: function(receiver) {
         return receiver.location;
       },
       get$parent: function(receiver) {
         return W._convertNativeToDart_Window(receiver.parent);
       },
-      close$0: function(receiver) {
-        return receiver.close();
-      },
       postMessage$3: function(receiver, message, targetOrigin, transfer) {
-        receiver.postMessage(P._convertDartToNative_PrepareForStructuredClone(message), targetOrigin);
+        receiver.postMessage(new P._StructuredCloneDart2Js([], []).walk$1(message), targetOrigin);
         return;
       },
       postMessage$2: function($receiver, message, targetOrigin) {
         return this.postMessage$3($receiver, message, targetOrigin, null);
       },
       print$0: [function(receiver) {
         return receiver.print();
       }, "call$0", "get$print", 0, 0, 2],
       $isWindow: 1,
       $isInterceptor: 1,
       "%": "DOMWindow|Window"
     },
     _ClientRect: {
-      "^": "Interceptor;bottom=,height=,left=,right=,top=,width=",
+      "^": "Interceptor;height=,left=,top=,width=",
       toString$0: function(receiver) {
         return "Rectangle (" + H.S(receiver.left) + ", " + H.S(receiver.top) + ") " + H.S(receiver.width) + " x " + H.S(receiver.height);
       },
       $eq: function(receiver, other) {
         var t1, t2, t3;
         if (other == null)
           return false;
         t1 = J.getInterceptor(other);
         if (!t1.$isRectangle)
           return false;
@@ skipping 97 matching lines @@
       "^": "Interceptor_ListMixin1+ImmutableListMixin;",
       $isList: 1,
       $asList: function() {
         return [W.Node];
       },
       $isEfficientLength: 1
     },
     _EventStream: {
       "^": "Stream;_target,_eventType,_useCapture",
       listen$4$cancelOnError$onDone$onError: function(onData, cancelOnError, onDone, onError) {
-        var t1 = new W._EventStreamSubscription(0, this._target, this._eventType, W._wrapZone(onData), this._useCapture);
+        var t1 = new W._EventStreamSubscription(0, this._target, this._eventType, W._wrapZone(onData), false);
         t1.$builtinTypeInfo = this.$builtinTypeInfo;
         t1._tryResume$0();
         return t1;
       },
+      listen$1: function(onData) {
+        return this.listen$4$cancelOnError$onDone$onError(onData, null, null, null);
+      },
       listen$3$onDone$onError: function(onData, onDone, onError) {
         return this.listen$4$cancelOnError$onDone$onError(onData, null, onDone, onError);
       }
     },
     _ElementEventStreamImpl: {
       "^": "_EventStream;_target,_eventType,_useCapture"
     },
     _EventStreamSubscription: {
       "^": "StreamSubscription;_pauseCount,_target,_eventType,_onData,_useCapture",
       cancel$0: function() {
@@ skipping 23 matching lines @@
         this._tryResume$0();
       },
       _tryResume$0: function() {
         var t1, t2, t3;
         t1 = this._onData;
         t2 = t1 != null;
         if (t2 && this._pauseCount <= 0) {
           t3 = this._target;
           t3.toString;
           if (t2)
-            J._addEventListener$3$x(t3, this._eventType, t1, this._useCapture);
+            J._addEventListener$3$x(t3, this._eventType, t1, false);
         }
       },
       _unlisten$0: function() {
         var t1, t2, t3;
         t1 = this._onData;
         t2 = t1 != null;
         if (t2) {
           t3 = this._target;
           t3.toString;
           if (t2)
-            J._removeEventListener$3$x(t3, this._eventType, t1, this._useCapture);
+            J._removeEventListener$3$x(t3, this._eventType, t1, false);
         }
       }
     },
     ImmutableListMixin: {
       "^": "Object;",
       get$iterator: function(receiver) {
         return new W.FixedSizeListIterator(receiver, this.get$length(receiver), -1, null);
       },
       add$1: function(receiver, value) {
         throw H.wrapException(new P.UnsupportedError("Cannot add to immutable List."));
       },
       setRange$4: function(receiver, start, end, iterable, skipCount) {
         throw H.wrapException(new P.UnsupportedError("Cannot setRange on immutable List."));
       },
       setRange$3: function($receiver, start, end, iterable) {
         return this.setRange$4($receiver, start, end, iterable, 0);
       },
       replaceRange$3: function(receiver, start, end, iterable) {
         throw H.wrapException(new P.UnsupportedError("Cannot modify an immutable List."));
       },
       $isList: 1,
       $asList: null,
       $isEfficientLength: 1
     },
     FixedSizeListIterator: {
-      "^": "Object;_array,_length,_position,_current",
+      "^": "Object;_array,_length,_position,_html$_current",
       moveNext$0: function() {
         var nextPosition, t1;
         nextPosition = this._position + 1;
         t1 = this._length;
         if (nextPosition < t1) {
-          this._current = J.$index$asx(this._array, nextPosition);
+          this._html$_current = J.$index$asx(this._array, nextPosition);
           this._position = nextPosition;
           return true;
         }
-        this._current = null;
+        this._html$_current = null;
         this._position = t1;
         return false;
       },
       get$current: function() {
-        return this._current;
+        return this._html$_current;
       }
     },
     _DOMWindowCrossFrame: {
       "^": "Object;_window",
       get$location: function(_) {
         return W._LocationCrossFrame__createSafe(this._window.location);
       },
       get$parent: function(_) {
         return W._DOMWindowCrossFrame__createSafe(this._window.parent);
       },
-      close$0: function(_) {
-        return this._window.close();
-      },
       postMessage$3: function(_, message, targetOrigin, messagePorts) {
-        this._window.postMessage(P._convertDartToNative_PrepareForStructuredClone(message), targetOrigin);
+        this._window.postMessage(new P._StructuredCloneDart2Js([], []).walk$1(message), targetOrigin);
       },
       postMessage$2: function($receiver, message, targetOrigin) {
         return this.postMessage$3($receiver, message, targetOrigin, null);
       },
       $isInterceptor: 1,
       static: {_DOMWindowCrossFrame__createSafe: function(w) {
           if (w === window)
             return w;
           else
             return new W._DOMWindowCrossFrame(w);
@@ skipping 232 matching lines @@
     "^": "",
     _callDartFunction: [function(callback, captureThis, $self, $arguments) {
       var arguments0, dartArgs;
       if (captureThis === true) {
         arguments0 = [$self];
         C.JSArray_methods.addAll$1(arguments0, $arguments);
         $arguments = arguments0;
       }
       dartArgs = P.List_List$from(J.map$1$ax($arguments, P.js___convertToDart$closure()), true, null);
       return P._convertToJS(H.Primitives_applyFunctionWithPositionalArguments(callback, dartArgs));
-    }, null, null, 8, 0, null, 14, 40, 0, 41],
+    }, null, null, 8, 0, null, 16, 41, 0, 42],
     _defineProperty: function(o, $name, value) {
       var exception;
-      if (Object.isExtensible(o) && !Object.prototype.hasOwnProperty.call(o, $name))
-        try {
+      try {
+        if (Object.isExtensible(o) && !Object.prototype.hasOwnProperty.call(o, $name)) {
           Object.defineProperty(o, $name, {value: value});
           return true;
-        } catch (exception) {
-          H.unwrapException(exception);
         }
+      } catch (exception) {
+        H.unwrapException(exception);
+      }
       return false;
     },
     _getOwnProperty: function(o, $name) {
       if (Object.prototype.hasOwnProperty.call(o, $name))
         return o[$name];
       return;
     },
     _convertToJS: [function(o) {
       var t1;
       if (o == null || typeof o === "string" || typeof o === "number" || typeof o === "boolean")
         return o;
       t1 = J.getInterceptor(o);
       if (!!t1.$isJsObject)
         return o._jsObject;
       if (!!t1.$isBlob || !!t1.$isEvent || !!t1.$isKeyRange || !!t1.$isImageData || !!t1.$isNode || !!t1.$isTypedData || !!t1.$isWindow)
         return o;
       if (!!t1.$isDateTime)
         return H.Primitives_lazyAsJsDate(o);
       if (!!t1.$isFunction)
         return P._getJsProxy(o, "$dart_jsFunction", new P._convertToJS_closure());
       return P._getJsProxy(o, "_$dart_jsObject", new P._convertToJS_closure0($.$get$_dartProxyCtor()));
-    }, "call$1", "js___convertToJS$closure", 2, 0, 0, 25],
+    }, "call$1", "js___convertToJS$closure", 2, 0, 0, 26],
     _getJsProxy: function(o, propertyName, createProxy) {
       var jsProxy = P._getOwnProperty(o, propertyName);
       if (jsProxy == null) {
         jsProxy = createProxy.call$1(o);
         P._defineProperty(o, propertyName, jsProxy);
       }
       return jsProxy;
     },
     _convertToDart: [function(o) {
-      var t1;
+      var t1, ms;
       if (o == null || typeof o == "string" || typeof o == "number" || typeof o == "boolean")
         return o;
       else {
         if (o instanceof Object) {
           t1 = J.getInterceptor(o);
           t1 = !!t1.$isBlob || !!t1.$isEvent || !!t1.$isKeyRange || !!t1.$isImageData || !!t1.$isNode || !!t1.$isTypedData || !!t1.$isWindow;
         } else
           t1 = false;
         if (t1)
           return o;
-        else if (o instanceof Date)
-          return P.DateTime$fromMillisecondsSinceEpoch(o.getTime(), false);
-        else if (o.constructor === $.$get$_dartProxyCtor())
+        else if (o instanceof Date) {
+          ms = o.getTime();
+          t1 = new P.DateTime(ms, false);
+          t1.DateTime$_withValue$2$isUtc(ms, false);
+          return t1;
+        } else if (o.constructor === $.$get$_dartProxyCtor())
           return o.o;
         else
           return P._wrapToDart(o);
       }
-    }, "call$1", "js___convertToDart$closure", 2, 0, 13, 25],
+    }, "call$1", "js___convertToDart$closure", 2, 0, 12, 26],
     _wrapToDart: function(o) {
       if (typeof o == "function")
-        return P._getDartProxy(o, $.$get$_DART_CLOSURE_PROPERTY_NAME(), new P._wrapToDart_closure());
+        return P._getDartProxy(o, $.$get$DART_CLOSURE_PROPERTY_NAME(), new P._wrapToDart_closure());
       if (o instanceof Array)
         return P._getDartProxy(o, $.$get$_DART_OBJECT_PROPERTY_NAME(), new P._wrapToDart_closure0());
       return P._getDartProxy(o, $.$get$_DART_OBJECT_PROPERTY_NAME(), new P._wrapToDart_closure1());
     },
     _getDartProxy: function(o, propertyName, createProxy) {
       var dartProxy = P._getOwnProperty(o, propertyName);
       if (dartProxy == null || !(o instanceof Object)) {
         dartProxy = createProxy.call$1(o);
         P._defineProperty(o, propertyName, dartProxy);
       }
@@ skipping 71 matching lines @@
           return len;
         throw H.wrapException(new P.StateError("Bad JsArray length"));
       },
       set$length: function(_, $length) {
         this.super$JsObject$$indexSet(this, "length", $length);
       },
       add$1: function(_, value) {
         this.callMethod$2("push", [value]);
       },
       setRange$4: function(_, start, end, iterable, skipCount) {
-        var $length, args, t1;
+        var $length, args, t1, t2, t3;
         P.JsArray__checkRange(start, end, this.get$length(this));
         $length = end - start;
         if ($length === 0)
           return;
         args = [start, $length];
-        t1 = new H.SubListIterable(iterable, skipCount, null);
-        t1.$builtinTypeInfo = [H.getRuntimeTypeArgument(iterable, "ListMixin", 0)];
+        t1 = H.setRuntimeTypeInfo(new H.SubListIterable(iterable, skipCount, null), [H.getRuntimeTypeArgument(iterable, "ListMixin", 0)]);
+        t2 = t1.__internal$_start;
+        if (t2 < 0)
+          H.throwExpression(P.RangeError$range(t2, 0, null, "start", null));
+        t3 = t1._endOrLength;
+        if (t3 != null) {
+          if (typeof t3 !== "number")
+            return t3.$lt();
+          if (t3 < 0)
+            H.throwExpression(P.RangeError$range(t3, 0, null, "end", null));
+          if (t2 > t3)
+            H.throwExpression(P.RangeError$range(t2, 0, t3, "start", null));
+        }
         C.JSArray_methods.addAll$1(args, t1.take$1(0, $length));
         this.callMethod$2("splice", args);
       },
       setRange$3: function($receiver, start, end, iterable) {
         return this.setRange$4($receiver, start, end, iterable, 0);
       },
       static: {JsArray__checkRange: function(start, end, $length) {
           if (start > $length)
             throw H.wrapException(P.RangeError$range(start, 0, $length, null, null));
           if (end < start || end > $length)
             throw H.wrapException(P.RangeError$range(end, start, $length, null, null));
         }}
     },
     JsObject_ListMixin: {
       "^": "JsObject+ListMixin;",
       $isList: 1,
       $asList: null,
       $isEfficientLength: 1
     },
     _convertToJS_closure: {
       "^": "Closure:0;",
       call$1: function(o) {
         var jsFunction = function(_call, f, captureThis) {
           return function() {
             return _call(f, captureThis, this, Array.prototype.slice.apply(arguments));
           };
         }(P._callDartFunction, o, false);
-        P._defineProperty(jsFunction, $.$get$_DART_CLOSURE_PROPERTY_NAME(), o);
+        P._defineProperty(jsFunction, $.$get$DART_CLOSURE_PROPERTY_NAME(), o);
         return jsFunction;
       }
     },
     _convertToJS_closure0: {
-      "^": "Closure:0;_captured_ctor_0",
+      "^": "Closure:0;ctor",
       call$1: function(o) {
-        return new this._captured_ctor_0(o);
+        return new this.ctor(o);
       }
     },
     _wrapToDart_closure: {
       "^": "Closure:0;",
       call$1: function(o) {
         return new P.JsFunction(o);
       }
     },
     _wrapToDart_closure0: {
       "^": "Closure:0;",
       call$1: function(o) {
         return H.setRuntimeTypeInfo(new P.JsArray(o), [null]);
       }
     },
     _wrapToDart_closure1: {
       "^": "Closure:0;",
       call$1: function(o) {
         return new P.JsObject(o);
       }
     }
   }], ["dart.math", "dart:math",, P, {
     "^": "",
-    _JenkinsSmiHash_combine0: function(hash, value) {
-      hash = 536870911 & hash + value;
-      hash = 536870911 & hash + ((524287 & hash) << 10 >>> 0);
-      return hash ^ hash >>> 6;
-    },
-    _JenkinsSmiHash_finish0: function(hash) {
-      hash = 536870911 & hash + ((67108863 & hash) << 3 >>> 0);
-      hash ^= hash >>> 11;
-      return 536870911 & hash + ((16383 & hash) << 15 >>> 0);
-    },
     max: [function(a, b) {
       if (typeof a !== "number")
         throw H.wrapException(P.ArgumentError$(a));
       if (typeof b !== "number")
         throw H.wrapException(P.ArgumentError$(b));
       if (a > b)
         return a;
       if (a < b)
         return b;
       if (typeof b === "number") {
         if (typeof a === "number")
           if (a === 0)
             return a + b;
-        if (C.JSDouble_methods.get$isNaN(b))
+        if (isNaN(b))
           return b;
         return a;
       }
       if (b === 0 && C.JSNumber_methods.get$isNegative(a))
         return b;
       return a;
-    }, "call$2", "math__max$closure", 4, 0, 45]
+    }, "call$2", "math__max$closure", 4, 0, 44]
+  }], ["dart.typed_data", "dart:typed_data",, P, {
+    "^": "",
+    Uint8List: {
+      "^": "Object;",
+      $isList: 1,
+      $asList: function() {
+        return [P.$int];
+      },
+      $isTypedData: 1,
+      $isEfficientLength: 1
+    }
   }], ["dart.typed_data.implementation", "dart:_native_typed_data",, H, {
     "^": "",
+    _checkValidRange: function(start, end, $length) {
+      var t1;
+      if (!(start >>> 0 !== start))
+        t1 = end >>> 0 !== end || start > end || end > $length;
+      else
+        t1 = true;
+      if (t1)
+        throw H.wrapException(H.diagnoseRangeError(start, end, $length));
+      return end;
+    },
     NativeByteBuffer: {
       "^": "Interceptor;",
       $isNativeByteBuffer: 1,
       "%": "ArrayBuffer"
     },
     NativeTypedData: {
       "^": "Interceptor;",
-      _invalidPosition$2: function(receiver, position, $length) {
-        throw H.wrapException(P.RangeError$range(position, 0, $length, null, null));
+      _invalidPosition$3: function(receiver, position, $length, $name) {
+        throw H.wrapException(P.RangeError$range(position, 0, $length, $name, null));
       },
-      _checkPosition$2: function(receiver, position, $length) {
+      _checkPosition$3: function(receiver, position, $length, $name) {
         if (position >>> 0 !== position || position > $length)
-          this._invalidPosition$2(receiver, position, $length);
-      },
-      _checkSublistArguments$3: function(receiver, start, end, $length) {
-        this._checkPosition$2(receiver, start, $length);
-        this._checkPosition$2(receiver, end, $length);
-        if (start > end)
-          throw H.wrapException(P.RangeError$range(start, 0, end, null, null));
-        return end;
+          this._invalidPosition$3(receiver, position, $length, $name);
       },
       $isNativeTypedData: 1,
       $isTypedData: 1,
       "%": ";ArrayBufferView;NativeTypedArray|NativeTypedArray_ListMixin|NativeTypedArray_ListMixin_FixedLengthListMixin|NativeTypedArrayOfDouble|NativeTypedArray_ListMixin0|NativeTypedArray_ListMixin_FixedLengthListMixin0|NativeTypedArrayOfInt"
     },
     NativeByteData: {
       "^": "NativeTypedData;",
       $isTypedData: 1,
       "%": "DataView"
     },
     NativeTypedArray: {
       "^": "NativeTypedData;",
       get$length: function(receiver) {
         return receiver.length;
       },
       _setRangeFast$4: function(receiver, start, end, source, skipCount) {
         var targetLength, count, sourceLength;
         targetLength = receiver.length;
-        this._checkPosition$2(receiver, start, targetLength);
-        this._checkPosition$2(receiver, end, targetLength);
+        this._checkPosition$3(receiver, start, targetLength, "start");
+        this._checkPosition$3(receiver, end, targetLength, "end");
         if (start > end)
           throw H.wrapException(P.RangeError$range(start, 0, end, null, null));
         count = end - start;
         sourceLength = source.length;
         if (sourceLength - skipCount < count)
           throw H.wrapException(new P.StateError("Not enough elements"));
         if (skipCount !== 0 || sourceLength !== count)
           source = source.subarray(skipCount, skipCount + count);
         receiver.set(source, start);
       },
@@ skipping 184 matching lines @@
     NativeUint8List: {
       "^": "NativeTypedArrayOfInt;",
       get$length: function(receiver) {
         return receiver.length;
       },
       $index: function(receiver, index) {
         if (index >>> 0 !== index || index >= receiver.length)
           H.throwExpression(H.diagnoseIndexError(receiver, index));
         return receiver[index];
       },
+      sublist$2: function(receiver, start, end) {
+        return new Uint8Array(receiver.subarray(start, H._checkValidRange(start, end, receiver.length)));
+      },
+      $isNativeUint8List: 1,
       $isTypedData: 1,
       $isList: 1,
       $asList: function() {
         return [P.$int];
       },
       $isEfficientLength: 1,
       "%": ";Uint8Array"
     }
   }], ["dart2js._js_primitives", "dart:_js_primitives",, H, {
     "^": "",
@@ skipping 15 matching lines @@
       throw "Unable to print message: " + String(string);
     }
   }], ["frame", "package:stack_trace/src/frame.dart",, S, {
     "^": "",
     Frame: {
       "^": "Object;uri<,line<,column<,member<",
       get$isCore: function() {
         return this.uri.scheme === "dart";
       },
       get$library: function() {
-        return $.$get$context0().prettyUri$1(this.uri);
+        var t1 = this.uri;
+        if (t1.scheme === "data")
+          return "data:...";
+        return $.$get$context0().prettyUri$1(t1);
       },
       get$$package: function() {
         var t1 = this.uri;
         if (t1.scheme !== "package")
           return;
         return C.JSArray_methods.get$first(t1._path.split("/"));
       },
       get$location: function(_) {
         var t1, t2;
         t1 = this.line;
         if (t1 == null)
-          return $.$get$context0().prettyUri$1(this.uri);
+          return this.get$library();
         t2 = this.column;
         if (t2 == null)
-          return $.$get$context0().prettyUri$1(this.uri) + " " + H.S(t1);
-        return $.$get$context0().prettyUri$1(this.uri) + " " + H.S(t1) + ":" + H.S(t2);
+          return this.get$library() + " " + H.S(t1);
+        return this.get$library() + " " + H.S(t1) + ":" + H.S(t2);
       },
       toString$0: function(_) {
         return this.get$location(this) + " in " + H.S(this.member);
       },
       static: {Frame_Frame$parseVM: function(frame) {
-          var match, t1, t2, member, uri, lineAndColumn, line;
-          if (J.$eq$(frame, "..."))
-            return new S.Frame(P.Uri_Uri(null, null, null, null, null, null, null, "", ""), null, null, "...");
-          match = $.$get$_vmFrame().firstMatch$1(frame);
-          if (match == null)
-            throw H.wrapException(new P.FormatException("Couldn't parse VM stack trace line '" + H.S(frame) + "'.", null, null));
-          t1 = match._match;
-          if (1 >= t1.length)
-            return H.ioore(t1, 1);
-          t2 = J.replaceAll$2$s(t1[1], $.$get$_asyncBody(), "<async>");
-          H.checkString("<fn>");
-          member = H.stringReplaceAllUnchecked(t2, "<anonymous closure>", "<fn>");
-          if (2 >= t1.length)
-            return H.ioore(t1, 2);
-          uri = P.Uri_parse(t1[2], 0, null);
-          if (3 >= t1.length)
-            return H.ioore(t1, 3);
-          lineAndColumn = J.split$1$s(t1[3], ":");
-          line = lineAndColumn.length > 1 ? H.Primitives_parseInt(lineAndColumn[1], null, null) : null;
-          return new S.Frame(uri, line, lineAndColumn.length > 2 ? H.Primitives_parseInt(lineAndColumn[2], null, null) : null, member);
+          return S.Frame__catchFormatException(frame, new S.closure0(frame));
         }, Frame_Frame$parseV8: function(frame) {
-          var match, t1, t2, t3, t4;
-          match = $.$get$_v8Frame().firstMatch$1(frame);
-          if (match == null)
-            throw H.wrapException(new P.FormatException("Couldn't parse V8 stack trace line '" + H.S(frame) + "'.", null, null));
-          t1 = new S.Frame_Frame$parseV8_parseLocation(frame);
-          t2 = match._match;
-          t3 = t2.length;
-          if (2 >= t3)
-            return H.ioore(t2, 2);
-          t4 = t2[2];
-          if (t4 != null) {
-            t2 = J.replaceAll$2$s(t2[1], "<anonymous>", "<fn>");
-            H.checkString("<fn>");
-            return t1.call$2(t4, H.stringReplaceAllUnchecked(t2, "Anonymous function", "<fn>"));
-          } else {
-            if (3 >= t3)
-              return H.ioore(t2, 3);
-            return t1.call$2(t2[3], "<fn>");
-          }
+          return S.Frame__catchFormatException(frame, new S.closure4(frame));
+        }, Frame_Frame$parseFirefox: function(frame) {
+          return S.Frame__catchFormatException(frame, new S.closure3(frame));
+        }, Frame_Frame$parseFriendly: function(frame) {
+          return S.Frame__catchFormatException(frame, new S.closure1(frame));
         }, Frame__uriOrPathToUri: function(uriOrPath) {
           var t1 = J.getInterceptor$asx(uriOrPath);
           if (t1.contains$1(uriOrPath, $.$get$Frame__uriRegExp()) === true)
             return P.Uri_parse(uriOrPath, 0, null);
           else if (t1.contains$1(uriOrPath, $.$get$Frame__windowsRegExp()) === true)
             return P.Uri_Uri$file(uriOrPath, true);
           else if (t1.startsWith$1(uriOrPath, "/"))
             return P.Uri_Uri$file(uriOrPath, false);
           if (t1.contains$1(uriOrPath, "\\") === true)
             return $.$get$windows().toUri$1(uriOrPath);
           return P.Uri_parse(uriOrPath, 0, null);
+        }, Frame__catchFormatException: function(text, body) {
+          var t1, exception;
+          try {
+            t1 = body.call$0();
+            return t1;
+          } catch (exception) {
+            if (H.unwrapException(exception) instanceof P.FormatException)
+              return new N.UnparsedFrame(P.Uri_Uri(null, null, "unparsed", null, null, null, null, "", ""), null, null, false, "unparsed", null, "unparsed", text);
+            else
+              throw exception;
+          }
         }}
     },
-    Frame_Frame$parseV8_parseLocation: {
-      "^": "Closure:3;_captured_frame_0",
+    closure0: {
+      "^": "Closure:1;frame",
+      call$0: function() {
+        var t1, match, t2, member, uri, lineAndColumn, line;
+        t1 = this.frame;
+        if (J.$eq$(t1, "..."))
+          return new S.Frame(P.Uri_Uri(null, null, null, null, null, null, null, "", ""), null, null, "...");
+        match = $.$get$_vmFrame().firstMatch$1(t1);
+        if (match == null)
+          return new N.UnparsedFrame(P.Uri_Uri(null, null, "unparsed", null, null, null, null, "", ""), null, null, false, "unparsed", null, "unparsed", t1);
+        t1 = match._match;
+        if (1 >= t1.length)
+          return H.ioore(t1, 1);
+        t2 = J.replaceAll$2$s(t1[1], $.$get$_asyncBody(), "<async>");
+        H.checkString("<fn>");
+        member = H.stringReplaceAllUnchecked(t2, "<anonymous closure>", "<fn>");
+        if (2 >= t1.length)
+          return H.ioore(t1, 2);
+        uri = P.Uri_parse(t1[2], 0, null);
+        if (3 >= t1.length)
+          return H.ioore(t1, 3);
+        lineAndColumn = J.split$1$s(t1[3], ":");
+        line = lineAndColumn.length > 1 ? H.Primitives_parseInt(lineAndColumn[1], null, null) : null;
+        return new S.Frame(uri, line, lineAndColumn.length > 2 ? H.Primitives_parseInt(lineAndColumn[2], null, null) : null, member);
+      }
+    },
+    closure4: {
+      "^": "Closure:1;frame",
+      call$0: function() {
+        var t1, match, t2, t3, t4;
+        t1 = this.frame;
+        match = $.$get$_v8Frame().firstMatch$1(t1);
+        if (match == null)
+          return new N.UnparsedFrame(P.Uri_Uri(null, null, "unparsed", null, null, null, null, "", ""), null, null, false, "unparsed", null, "unparsed", t1);
+        t1 = new S._parseLocation(t1);
+        t2 = match._match;
+        t3 = t2.length;
+        if (2 >= t3)
+          return H.ioore(t2, 2);
+        t4 = t2[2];
+        if (t4 != null) {
+          t2 = J.replaceAll$2$s(t2[1], "<anonymous>", "<fn>");
+          H.checkString("<fn>");
+          return t1.call$2(t4, H.stringReplaceAllUnchecked(t2, "Anonymous function", "<fn>"));
+        } else {
+          if (3 >= t3)
+            return H.ioore(t2, 3);
+          return t1.call$2(t2[3], "<fn>");
+        }
+      }
+    },
+    _parseLocation: {
+      "^": "Closure:3;frame",
       call$2: function($location, member) {
         var t1, evalMatch, t2, urlMatch, t3;
         t1 = $.$get$_v8EvalLocation();
         evalMatch = t1.firstMatch$1($location);
         for (; evalMatch != null;) {
           t2 = evalMatch._match;
           if (1 >= t2.length)
             return H.ioore(t2, 1);
           $location = t2[1];
           evalMatch = t1.firstMatch$1($location);
         }
+        if (J.$eq$($location, "native"))
+          return new S.Frame(P.Uri_parse("native", 0, null), null, null, member);
         urlMatch = $.$get$_v8UrlLocation().firstMatch$1($location);
         if (urlMatch == null)
-          throw H.wrapException(new P.FormatException("Couldn't parse V8 stack trace line '" + H.S(this._captured_frame_0) + "'.", null, null));
+          return new N.UnparsedFrame(P.Uri_Uri(null, null, "unparsed", null, null, null, null, "", ""), null, null, false, "unparsed", null, "unparsed", this.frame);
         t1 = urlMatch._match;
         if (1 >= t1.length)
           return H.ioore(t1, 1);
         t2 = S.Frame__uriOrPathToUri(t1[1]);
         if (2 >= t1.length)
           return H.ioore(t1, 2);
         t3 = H.Primitives_parseInt(t1[2], null, null);
         if (3 >= t1.length)
           return H.ioore(t1, 3);
         return new S.Frame(t2, t3, H.Primitives_parseInt(t1[3], null, null), member);
       }
+    },
+    closure3: {
+      "^": "Closure:1;frame",
+      call$0: function() {
+        var t1, match, uri, t2, t3, member, line, column;
+        t1 = this.frame;
+        match = $.$get$_firefoxSafariFrame().firstMatch$1(t1);
+        if (match == null)
+          return new N.UnparsedFrame(P.Uri_Uri(null, null, "unparsed", null, null, null, null, "", ""), null, null, false, "unparsed", null, "unparsed", t1);
+        t1 = match._match;
+        if (3 >= t1.length)
+          return H.ioore(t1, 3);
+        uri = S.Frame__uriOrPathToUri(t1[3]);
+        t2 = t1.length;
+        if (1 >= t2)
+          return H.ioore(t1, 1);
+        t3 = t1[1];
+        if (t3 != null) {
+          if (2 >= t2)
+            return H.ioore(t1, 2);
+          t2 = C.JSString_methods.allMatches$1("/", t1[2]);
+          member = J.$add$ns(t3, C.JSArray_methods.join$0(P.List_List$filled(t2.get$length(t2), ".<fn>", false, null)));
+          if (J.$eq$(member, ""))
+            member = "<fn>";
+          member = J.replaceFirst$2$s(member, $.$get$_initialDot(), "");
+        } else
+          member = "<fn>";
+        if (4 >= t1.length)
+          return H.ioore(t1, 4);
+        if (J.$eq$(t1[4], ""))
+          line = null;
+        else {
+          if (4 >= t1.length)
+            return H.ioore(t1, 4);
+          line = H.Primitives_parseInt(t1[4], null, null);
+        }
+        if (5 >= t1.length)
+          return H.ioore(t1, 5);
+        t2 = t1[5];
+        if (t2 == null || J.$eq$(t2, ""))
+          column = null;
+        else {
+          if (5 >= t1.length)
+            return H.ioore(t1, 5);
+          column = H.Primitives_parseInt(t1[5], null, null);
+        }
+        return new S.Frame(uri, line, column, member);
+      }
+    },
+    closure1: {
+      "^": "Closure:1;frame",
+      call$0: function() {
+        var t1, match, uri, t2, line, column;
+        t1 = this.frame;
+        match = $.$get$_friendlyFrame().firstMatch$1(t1);
+        if (match == null)
+          throw H.wrapException(new P.FormatException("Couldn't parse package:stack_trace stack trace line '" + H.S(t1) + "'.", null, null));
+        t1 = match._match;
+        if (1 >= t1.length)
+          return H.ioore(t1, 1);
+        uri = P.Uri_parse(t1[1], 0, null);
+        if (uri.scheme === "") {
+          t2 = $.$get$context0();
+          uri = t2.toUri$1(t2.absolute$7(0, t2.fromUri$1(uri), null, null, null, null, null, null));
+        }
+        if (2 >= t1.length)
+          return H.ioore(t1, 2);
+        t2 = t1[2];
+        line = t2 == null ? null : H.Primitives_parseInt(t2, null, null);
+        if (3 >= t1.length)
+          return H.ioore(t1, 3);
+        t2 = t1[3];
+        column = t2 == null ? null : H.Primitives_parseInt(t2, null, null);
+        if (4 >= t1.length)
+          return H.ioore(t1, 4);
+        return new S.Frame(uri, line, column, t1[4]);
+      }
     }
-  }], ["html_common", "dart:html_common",, P, {
+  }], ["", "package:stream_channel/src/guarantee_channel.dart",, K, {
     "^": "",
-    _convertDartToNative_PrepareForStructuredClone: function(value) {
-      var copies, copy;
-      copies = [];
-      copy = new P._convertDartToNative_PrepareForStructuredClone_walk(new P._convertDartToNative_PrepareForStructuredClone_findSlot([], copies), new P._convertDartToNative_PrepareForStructuredClone_readSlot(copies), new P._convertDartToNative_PrepareForStructuredClone_writeSlot(copies)).call$1(value);
-      new P._convertDartToNative_PrepareForStructuredClone_cleanupSlots().call$0();
-      return copy;
-    },
-    convertNativeToDart_AcceptStructuredClone: function(object, mustCopy) {
-      var copies = [];
-      return new P.convertNativeToDart_AcceptStructuredClone_walk(mustCopy, new P.convertNativeToDart_AcceptStructuredClone_findSlot([], copies), new P.convertNativeToDart_AcceptStructuredClone_readSlot(copies), new P.convertNativeToDart_AcceptStructuredClone_writeSlot(copies)).call$1(object);
-    },
-    _convertDartToNative_PrepareForStructuredClone_findSlot: {
-      "^": "Closure:15;_captured_values_1,_captured_copies_2",
-      call$1: function(value) {
+    GuaranteeChannel: {
+      "^": "StreamChannelMixin;_sink,_streamController,_guarantee_channel$_subscription,_disconnected",
+      _onSinkDisconnected$0: function() {
+        this._disconnected = true;
+        var t1 = this._guarantee_channel$_subscription;
+        if (t1 != null)
+          t1.cancel$0();
+        this._streamController.close$0(0);
+      },
+      GuaranteeChannel$3$allowSinkErrors: function(innerSink, allowSinkErrors, _box_0, $T) {
+        this._sink = H.setRuntimeTypeInfo(new K._GuaranteeSink(innerSink, this, H.setRuntimeTypeInfo(new P._AsyncCompleter(H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null])), [null]), false, false, null, null, true), [$T]);
+        this._streamController = P.StreamController_StreamController(null, new K.GuaranteeChannel_closure(_box_0, this), null, null, true, $T);
+      },
+      static: {GuaranteeChannel$: function(innerStream, innerSink, allowSinkErrors, $T) {
+          var t1, t2;
+          t1 = {};
+          t1.innerStream = innerStream;
+          t2 = H.setRuntimeTypeInfo(new K.GuaranteeChannel(null, null, null, false), [$T]);
+          t2.GuaranteeChannel$3$allowSinkErrors(innerSink, true, t1, $T);
+          return t2;
+        }}
+    },
+    GuaranteeChannel_closure: {
+      "^": "Closure:1;_box_0,$this",
+      call$0: function() {
+        var t1, t2, t3;
+        t1 = this.$this;
+        if (t1._disconnected)
+          return;
+        t2 = this._box_0.innerStream;
+        t3 = t1._streamController;
+        t1._guarantee_channel$_subscription = t2.listen$3$onDone$onError(t3.get$add(t3), new K.GuaranteeChannel__closure(t1), t1._streamController.get$addError());
+      }
+    },
+    GuaranteeChannel__closure: {
+      "^": "Closure:1;$this",
+      call$0: [function() {
+        var t1 = this.$this;
+        t1._sink._onStreamDisconnected$0();
+        t1._streamController.close$0(0);
+      }, null, null, 0, 0, null, "call"]
+    },
+    _GuaranteeSink: {
+      "^": "Object;_inner,_channel,_doneCompleter,_disconnected,_closed,_addStreamSubscription,_addStreamCompleter,_allowErrors",
+      add$1: function(_, data) {
+        var t1;
+        if (this._closed)
+          throw H.wrapException(new P.StateError("Cannot add event after closing."));
+        if (this._addStreamSubscription != null)
+          throw H.wrapException(new P.StateError("Cannot add event while adding stream."));
+        if (this._disconnected)
+          return;
+        t1 = this._inner._async$_target;
+        if (t1._state >= 4)
+          H.throwExpression(t1._badEventState$0());
+        t1._async$_add$1(data);
+      },
+      addError$2: [function(error, stackTrace) {
+        if (this._closed)
+          throw H.wrapException(new P.StateError("Cannot add event after closing."));
+        if (this._addStreamSubscription != null)
+          throw H.wrapException(new P.StateError("Cannot add event while adding stream."));
+        if (this._disconnected)
+          return;
+        this._addError$2(error, stackTrace);
+      }, function(error) {
+        return this.addError$2(error, null);
+      }, "addError$1", "call$2", "call$1", "get$addError", 2, 2, 6, 5, 1, 2],
+      _addError$2: [function(error, stackTrace) {
+        this._inner._async$_target.addError$2(error, stackTrace);
+        return;
+      }, function(error) {
+        return this._addError$2(error, null);
+      }, "_addError$1", "call$2", "call$1", "get$_addError", 2, 2, 6, 5, 1, 2],
+      addStream$1: function(stream) {
+        var t1, t2, t3;
+        if (this._closed)
+          throw H.wrapException(new P.StateError("Cannot add stream after closing."));
+        if (this._addStreamSubscription != null)
+          throw H.wrapException(new P.StateError("Cannot add stream while adding stream."));
+        if (this._disconnected) {
+          t1 = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null]);
+          t1._asyncComplete$1(null);
+          return t1;
+        }
+        this._addStreamCompleter = H.setRuntimeTypeInfo(new P._SyncCompleter(H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null])), [null]);
+        t1 = this._inner;
+        t1 = t1.get$add(t1);
+        t2 = this.get$_addError();
+        t3 = this._addStreamCompleter;
+        this._addStreamSubscription = stream.listen$3$onDone$onError(t1, t3.get$complete(t3), t2);
+        return this._addStreamCompleter.future.then$1(new K._GuaranteeSink_addStream_closure(this));
+      },
+      close$0: function(_) {
+        if (this._addStreamSubscription != null)
+          throw H.wrapException(new P.StateError("Cannot close sink while adding stream."));
+        if (this._closed)
+          return this._doneCompleter.future;
+        this._closed = true;
+        if (!this._disconnected) {
+          this._channel._onSinkDisconnected$0();
+          this._doneCompleter.complete$1(0, this._inner._async$_target.close$0(0));
+        }
+        return this._doneCompleter.future;
+      },
+      _onStreamDisconnected$0: function() {
+        this._disconnected = true;
+        var t1 = this._doneCompleter;
+        if (t1.future._state === 0)
+          t1.complete$0(0);
+        t1 = this._addStreamSubscription;
+        if (t1 == null)
+          return;
+        this._addStreamCompleter.complete$1(0, t1.cancel$0());
+        this._addStreamCompleter = null;
+        this._addStreamSubscription = null;
+      }
+    },
+    _GuaranteeSink_addStream_closure: {
+      "^": "Closure:0;$this",
+      call$1: [function(_) {
+        var t1 = this.$this;
+        t1._addStreamCompleter = null;
+        t1._addStreamSubscription = null;
+      }, null, null, 2, 0, null, 9, "call"]
+    }
+  }], ["", "host.dart",, M, {
+    "^": "",
+    main: [function() {
+      var testRunner = J.$index$asx($.$get$context(), "testRunner");
+      if (testRunner != null)
+        testRunner.callMethod$2("waitUntilDone", []);
+      P.runZoned(new M.main_closure(), new M.main_closure0(), null, null);
+    }, "call$0", "host__main$closure", 0, 0, 2],
+    _connectToServer: function() {
+      var currentUrl, t1, webSocket, controller;
+      currentUrl = P.Uri_parse(window.location.href, 0, null);
+      t1 = currentUrl._queryParameters;
+      if (t1 == null) {
+        t1 = currentUrl._query;
+        t1 = H.setRuntimeTypeInfo(new P.UnmodifiableMapView(P.Uri_splitQueryString(t1 == null ? "" : t1, C.Utf8Codec_false)), [null, null]);
+        currentUrl._queryParameters = t1;
+      }
+      webSocket = W.WebSocket_WebSocket(J.$index$asx(t1._map, "managerUrl"), null);
+      controller = B.StreamChannelController$(true, true, null);
+      t1 = H.setRuntimeTypeInfo(new W._EventStream(webSocket, "message", false), [null]);
+      H.setRuntimeTypeInfo(new W._EventStreamSubscription(0, t1._target, t1._eventType, W._wrapZone(new M._connectToServer_closure(controller)), false), [H.getTypeArgumentByIndex(t1, 0)])._tryResume$0();
+      t1 = controller._local._streamController;
+      t1.toString;
+      H.setRuntimeTypeInfo(new P._ControllerStream(t1), [H.getTypeArgumentByIndex(t1, 0)]).listen$1(new M._connectToServer_closure0(webSocket));
+      return D._MultiChannel$(controller._foreign);
+    },
+    _connectToIframe: function(url, id) {
+      var t1, iframe, controller, readyCompleter;
+      t1 = document;
+      iframe = t1.createElement("iframe");
+      $.$get$_iframes().$indexSet(0, id, iframe);
+      J.set$src$x(iframe, url);
+      document.body.appendChild(iframe);
+      controller = B.StreamChannelController$(true, true, null);
+      readyCompleter = H.setRuntimeTypeInfo(new P._AsyncCompleter(H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null])), [null]);
+      t1 = H.setRuntimeTypeInfo(new W._EventStream(window, "message", false), [null]);
+      H.setRuntimeTypeInfo(new W._EventStreamSubscription(0, t1._target, t1._eventType, W._wrapZone(new M._connectToIframe_closure(iframe, controller, readyCompleter)), false), [H.getTypeArgumentByIndex(t1, 0)])._tryResume$0();
+      t1 = controller._local._streamController;
+      t1.toString;
+      H.setRuntimeTypeInfo(new P._ControllerStream(t1), [H.getTypeArgumentByIndex(t1, 0)]).listen$1(new M._connectToIframe_closure0(iframe, readyCompleter));
+      return controller._foreign;
+    },
+    main_closure: {
+      "^": "Closure:1;",
+      call$0: [function() {
+        var serverChannel, t1;
+        serverChannel = M._connectToServer();
+        t1 = serverChannel._mainController._foreign._streamController;
+        t1.toString;
+        H.setRuntimeTypeInfo(new P._ControllerStream(t1), [H.getTypeArgumentByIndex(t1, 0)]).listen$1(new M.main__closure(serverChannel));
+        P.Timer_Timer$periodic(P.Duration$(0, 0, 0, 0, 0, 1), new M.main__closure0(serverChannel));
+        t1 = J.get$onClick$x(document.querySelector("#play"));
+        H.setRuntimeTypeInfo(new W._EventStreamSubscription(0, t1._target, t1._eventType, W._wrapZone(new M.main__closure1(serverChannel)), false), [H.getTypeArgumentByIndex(t1, 0)])._tryResume$0();
+      }, null, null, 0, 0, null, "call"]
+    },
+    main__closure: {
+      "^": "Closure:0;serverChannel",
+      call$1: [function(message) {
+        var t1, suiteChannel, iframeChannel;
+        t1 = J.getInterceptor$asx(message);
+        if (J.$eq$(t1.$index(message, "command"), "loadSuite")) {
+          suiteChannel = this.serverChannel.virtualChannel$1(t1.$index(message, "channel"));
+          iframeChannel = M._connectToIframe(t1.$index(message, "url"), t1.$index(message, "id"));
+          suiteChannel.stream.pipe$1(iframeChannel._sink);
+          t1 = iframeChannel._streamController;
+          t1.toString;
+          H.setRuntimeTypeInfo(new P._ControllerStream(t1), [H.getTypeArgumentByIndex(t1, 0)]).pipe$1(suiteChannel.sink);
+        } else if (J.$eq$(t1.$index(message, "command"), "displayPause")) {
+          t1 = document.body;
+          t1.toString;
+          W._ElementCssClassSet__add(t1, "paused");
+        } else if (J.$eq$(t1.$index(message, "command"), "resume")) {
+          t1 = document.body;
+          t1.toString;
+          W._ElementCssClassSet__remove(t1, "paused");
+        } else
+          J.remove$0$ax($.$get$_iframes().$index(0, t1.$index(message, "id")));
+      }, null, null, 2, 0, null, 7, "call"]
+    },
+    main__closure0: {
+      "^": "Closure:0;serverChannel",
+      call$1: [function(_) {
+        return this.serverChannel._mainController._foreign._sink.add$1(0, P.LinkedHashMap__makeLiteral(["command", "ping"]));
+      }, null, null, 2, 0, null, 9, "call"]
+    },
+    main__closure1: {
+      "^": "Closure:0;serverChannel",
+      call$1: [function(_) {
+        var t1 = document.body;
+        t1.toString;
+        W._ElementCssClassSet__remove(t1, "paused");
+        this.serverChannel._mainController._foreign._sink.add$1(0, P.LinkedHashMap__makeLiteral(["command", "resume"]));
+      }, null, null, 2, 0, null, 9, "call"]
+    },
+    main_closure0: {
+      "^": "Closure:3;",
+      call$2: [function(error, stackTrace) {
+        P.print(H.S(error) + "\n" + H.S(R.Trace_Trace$from(stackTrace).get$terse()));
+      }, null, null, 4, 0, null, 1, 2, "call"]
+    },
+    _connectToServer_closure: {
+      "^": "Closure:0;controller",
+      call$1: [function(message) {
+        this.controller._local._sink.add$1(0, C.JsonCodec_null_null.decode$1(J.get$data$x(message)));
+      }, null, null, 2, 0, null, 7, "call"]
+    },
+    _connectToServer_closure0: {
+      "^": "Closure:0;webSocket",
+      call$1: [function(message) {
+        return this.webSocket.send(C.JsonCodec_null_null.encode$1(message));
+      }, null, null, 2, 0, null, 7, "call"]
+    },
+    _connectToIframe_closure: {
+      "^": "Closure:0;iframe,controller,readyCompleter",
+      call$1: [function(message) {
+        var t1, t2, t3;
+        t1 = J.getInterceptor$x(message);
+        t2 = t1.get$origin(message);
+        t3 = window.location;
+        if (t2 !== (t3 && C.Location_methods).get$origin(t3))
+          return;
+        if (!J.$eq$(J.$index$asx(t1.get$data(message), "href"), J.get$src$x(this.iframe)))
+          return;
+        t1.stopPropagation$0(message);
+        if (J.$eq$(J.$index$asx(t1.get$data(message), "ready"), true))
+          this.readyCompleter.complete$0(0);
+        else
+          this.controller._local._sink.add$1(0, J.$index$asx(t1.get$data(message), "data"));
+      }, null, null, 2, 0, null, 7, "call"]
+    },
+    _connectToIframe_closure0: {
+      "^": "Closure:50;iframe,readyCompleter",
+      call$1: [function(message) {
+        var $async$goto = 0, $async$completer = new P.Completer_Completer$sync(), $async$handler = 1, $async$currentError, $async$self = this, t1, t2, t3;
+        var $async$call$1 = P._wrapJsFunctionForAsync(function($async$errorCode, $async$result) {
+          if ($async$errorCode === 1) {
+            $async$currentError = $async$result;
+            $async$goto = $async$handler;
+          }
+          while (true)
+            switch ($async$goto) {
+              case 0:
+                // Function start
+                $async$goto = 2;
+                return P._asyncHelper($async$self.readyCompleter.future, $async$call$1, $async$completer);
+              case 2:
+                // returning from await.
+                t1 = J.get$contentWindow$x($async$self.iframe);
+                t2 = C.JsonCodec_null_null.encode$1(message);
+                t3 = window.location;
+                J.postMessage$2$x(t1, t2, (t3 && C.Location_methods).get$origin(t3));
+                // implicit return
+                return P._asyncHelper(null, 0, $async$completer, null);
+              case 1:
+                // rethrow
+                return P._asyncHelper($async$currentError, 1, $async$completer);
+            }
+        });
+        return P._asyncHelper(null, $async$call$1, $async$completer, null);
+      }, null, null, 2, 0, null, 7, "call"]
+    }
+  }, 1], ["html_common", "dart:html_common",, P, {
+    "^": "",
+    convertNativePromiseToDartFuture: function(promise) {
+      var completer = H.setRuntimeTypeInfo(new P._AsyncCompleter(H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null])), [null]);
+      promise.then(H.convertDartClosureToJS(new P.convertNativePromiseToDartFuture_closure(completer), 1))["catch"](H.convertDartClosureToJS(new P.convertNativePromiseToDartFuture_closure0(completer), 1));
+      return completer.future;
+    },
+    _StructuredClone: {
+      "^": "Object;",
+      findSlot$1: function(value) {
         var t1, $length, i;
-        t1 = this._captured_values_1;
+        t1 = this.values;
         $length = t1.length;
         for (i = 0; i < $length; ++i)
           if (t1[i] === value)
             return i;
         t1.push(value);
-        this._captured_copies_2.push(null);
+        this.copies.push(null);
         return $length;
-      }
-    },
-    _convertDartToNative_PrepareForStructuredClone_readSlot: {
-      "^": "Closure:14;_captured_copies_3",
-      call$1: function(i) {
-        var t1 = this._captured_copies_3;
-        if (i >= t1.length)
-          return H.ioore(t1, i);
-        return t1[i];
-      }
-    },
-    _convertDartToNative_PrepareForStructuredClone_writeSlot: {
-      "^": "Closure:12;_captured_copies_4",
-      call$2: function(i, x) {
-        var t1 = this._captured_copies_4;
-        if (i >= t1.length)
-          return H.ioore(t1, i);
-        t1[i] = x;
-      }
-    },
-    _convertDartToNative_PrepareForStructuredClone_cleanupSlots: {
-      "^": "Closure:1;",
-      call$0: function() {
-      }
-    },
-    _convertDartToNative_PrepareForStructuredClone_walk: {
-      "^": "Closure:0;_captured_findSlot_5,_captured_readSlot_6,_captured_writeSlot_7",
-      call$1: function(e) {
-        var t1, t2, slot, copy, $length, i;
+      },
+      walk$1: function(e) {
+        var t1, t2, slot, t3, t4, copy;
         t1 = {};
         if (e == null)
           return e;
         if (typeof e === "boolean")
           return e;
         if (typeof e === "number")
           return e;
         if (typeof e === "string")
           return e;
         t2 = J.getInterceptor(e);
         if (!!t2.$isDateTime)
-          return new Date(e.millisecondsSinceEpoch);
+          return new Date(e._core$_value);
         if (!!t2.$isRegExp)
           throw H.wrapException(new P.UnimplementedError("structured clone of RegExp"));
         if (!!t2.$isFile)
           return e;
         if (!!t2.$isBlob)
           return e;
         if (!!t2.$isImageData)
           return e;
-        if (!!t2.$isNativeByteBuffer)
-          return e;
-        if (!!t2.$isNativeTypedData)
+        if (!!t2.$isNativeByteBuffer || !!t2.$isNativeTypedData)
           return e;
         if (!!t2.$isMap) {
-          slot = this._captured_findSlot_5.call$1(e);
-          copy = this._captured_readSlot_6.call$1(slot);
-          t1._captured_copy_0 = copy;
+          slot = this.findSlot$1(e);
+          t3 = this.copies;
+          t4 = t3.length;
+          if (slot >= t4)
+            return H.ioore(t3, slot);
+          copy = t3[slot];
+          t1.copy = copy;
           if (copy != null)
             return copy;
           copy = {};
-          t1._captured_copy_0 = copy;
-          this._captured_writeSlot_7.call$2(slot, copy);
-          t2.forEach$1(e, new P._convertDartToNative_PrepareForStructuredClone_walk_closure(t1, this));
-          return t1._captured_copy_0;
+          t1.copy = copy;
+          if (slot >= t4)
+            return H.ioore(t3, slot);
+          t3[slot] = copy;
+          t2.forEach$1(e, new P._StructuredClone_walk_closure(t1, this));
+          return t1.copy;
         }
         if (!!t2.$isList) {
-          $length = t2.get$length(e);
-          slot = this._captured_findSlot_5.call$1(e);
-          copy = this._captured_readSlot_6.call$1(slot);
-          if (copy != null) {
-            if (true === copy) {
-              copy = new Array($length);
-              this._captured_writeSlot_7.call$2(slot, copy);
-            }
+          slot = this.findSlot$1(e);
+          t1 = this.copies;
+          if (slot >= t1.length)
+            return H.ioore(t1, slot);
+          copy = t1[slot];
+          if (copy != null)
             return copy;
-          }
-          copy = new Array($length);
-          this._captured_writeSlot_7.call$2(slot, copy);
-          for (i = 0; i < $length; ++i) {
-            t1 = this.call$1(t2.$index(e, i));
-            if (i >= copy.length)
-              return H.ioore(copy, i);
-            copy[i] = t1;
-          }
-          return copy;
+          return this.copyList$2(e, slot);
         }
         throw H.wrapException(new P.UnimplementedError("structured clone of other type"));
+      },
+      copyList$2: function(e, slot) {
+        var t1, $length, copy, t2, i;
+        t1 = J.getInterceptor$asx(e);
+        $length = t1.get$length(e);
+        copy = new Array($length);
+        t2 = this.copies;
+        if (slot >= t2.length)
+          return H.ioore(t2, slot);
+        t2[slot] = copy;
+        for (i = 0; i < $length; ++i) {
+          t2 = this.walk$1(t1.$index(e, i));
+          if (i >= copy.length)
+            return H.ioore(copy, i);
+          copy[i] = t2;
+        }
+        return copy;
       }
     },
-    _convertDartToNative_PrepareForStructuredClone_walk_closure: {
-      "^": "Closure:3;_html_common$_box_0,_captured_walk_8",
+    _StructuredClone_walk_closure: {
+      "^": "Closure:3;_box_0,$this",
       call$2: [function(key, value) {
-        this._html_common$_box_0._captured_copy_0[key] = this._captured_walk_8.call$1(value);
-      }, null, null, 4, 0, null, 13, 8, "call"]
+        this._box_0.copy[key] = this.$this.walk$1(value);
+      }, null, null, 4, 0, null, 17, 6, "call"]
     },
-    convertNativeToDart_AcceptStructuredClone_findSlot: {
-      "^": "Closure:15;_captured_values_0,_captured_copies_1",
-      call$1: function(value) {
+    _AcceptStructuredClone: {
+      "^": "Object;",
+      findSlot$1: function(value) {
         var t1, $length, i, t2;
-        t1 = this._captured_values_0;
+        t1 = this.values;
         $length = t1.length;
         for (i = 0; i < $length; ++i) {
           t2 = t1[i];
           if (t2 == null ? value == null : t2 === value)
             return i;
         }
         t1.push(value);
-        this._captured_copies_1.push(null);
+        this.copies.push(null);
         return $length;
-      }
-    },
-    convertNativeToDart_AcceptStructuredClone_readSlot: {
-      "^": "Closure:14;_captured_copies_2",
-      call$1: function(i) {
-        var t1 = this._captured_copies_2;
-        if (i >= t1.length)
-          return H.ioore(t1, i);
-        return t1[i];
-      }
-    },
-    convertNativeToDart_AcceptStructuredClone_writeSlot: {
-      "^": "Closure:12;_captured_copies_3",
-      call$2: function(i, x) {
-        var t1 = this._captured_copies_3;
-        if (i >= t1.length)
-          return H.ioore(t1, i);
-        t1[i] = x;
-      }
-    },
-    convertNativeToDart_AcceptStructuredClone_walk: {
-      "^": "Closure:0;_captured_mustCopy_4,_captured_findSlot_5,_captured_readSlot_6,_captured_writeSlot_7",
-      call$1: function(e) {
-        var proto, slot, copy, t1, t2, _i, key, $length, i;
+      },
+      walk$1: function(e) {
+        var t1, millisSinceEpoch, proto, slot, t2, t3, copy, $length, i;
+        t1 = {};
         if (e == null)
           return e;
         if (typeof e === "boolean")
           return e;
         if (typeof e === "number")
           return e;
         if (typeof e === "string")
           return e;
-        if (e instanceof Date)
-          return P.DateTime$fromMillisecondsSinceEpoch(e.getTime(), true);
+        if (e instanceof Date) {
+          millisSinceEpoch = e.getTime();
+          t1 = new P.DateTime(millisSinceEpoch, true);
+          t1.DateTime$_withValue$2$isUtc(millisSinceEpoch, true);
+          return t1;
+        }
         if (e instanceof RegExp)
           throw H.wrapException(new P.UnimplementedError("structured clone of RegExp"));
+        if (typeof Promise != "undefined" && e instanceof Promise)
+          return P.convertNativePromiseToDartFuture(e);
         proto = Object.getPrototypeOf(e);
         if (proto === Object.prototype || proto === null) {
-          slot = this._captured_findSlot_5.call$1(e);
-          copy = this._captured_readSlot_6.call$1(slot);
+          slot = this.findSlot$1(e);
+          t2 = this.copies;
+          t3 = t2.length;
+          if (slot >= t3)
+            return H.ioore(t2, slot);
+          copy = t2[slot];
+          t1.copy = copy;
           if (copy != null)
             return copy;
           copy = P.LinkedHashMap__makeEmpty();
-          this._captured_writeSlot_7.call$2(slot, copy);
-          for (t1 = Object.keys(e), t2 = t1.length, _i = 0; _i < t1.length; t1.length === t2 || (0, H.throwConcurrentModificationError)(t1), ++_i) {
-            key = t1[_i];
-            copy.$indexSet(0, key, this.call$1(e[key]));
-          }
-          return copy;
+          t1.copy = copy;
+          if (slot >= t3)
+            return H.ioore(t2, slot);
+          t2[slot] = copy;
+          this.forEachJsField$2(e, new P._AcceptStructuredClone_walk_closure(t1, this));
+          return t1.copy;
         }
         if (e instanceof Array) {
-          slot = this._captured_findSlot_5.call$1(e);
-          copy = this._captured_readSlot_6.call$1(slot);
+          slot = this.findSlot$1(e);
+          t1 = this.copies;
+          if (slot >= t1.length)
+            return H.ioore(t1, slot);
+          copy = t1[slot];
           if (copy != null)
             return copy;
-          t1 = J.getInterceptor$asx(e);
-          $length = t1.get$length(e);
-          copy = this._captured_mustCopy_4 ? new Array($length) : e;
-          this._captured_writeSlot_7.call$2(slot, copy);
+          t2 = J.getInterceptor$asx(e);
+          $length = t2.get$length(e);
+          copy = this.mustCopy ? new Array($length) : e;
+          if (slot >= t1.length)
+            return H.ioore(t1, slot);
+          t1[slot] = copy;
           if (typeof $length !== "number")
             return H.iae($length);
-          t2 = J.getInterceptor$ax(copy);
+          t1 = J.getInterceptor$ax(copy);
           i = 0;
           for (; i < $length; ++i)
-            t2.$indexSet(copy, i, this.call$1(t1.$index(e, i)));
+            t1.$indexSet(copy, i, this.walk$1(t2.$index(e, i)));
           return copy;
         }
         return e;
       }
+    },
+    _AcceptStructuredClone_walk_closure: {
+      "^": "Closure:3;_box_0,$this",
+      call$2: function(key, value) {
+        var t1, t2;
+        t1 = this._box_0.copy;
+        t2 = this.$this.walk$1(value);
+        J.$indexSet$ax(t1, key, t2);
+        return t2;
+      }
+    },
+    _StructuredCloneDart2Js: {
+      "^": "_StructuredClone;values,copies"
+    },
+    _AcceptStructuredCloneDart2Js: {
+      "^": "_AcceptStructuredClone;values,copies,mustCopy",
+      forEachJsField$2: function(object, action) {
+        var t1, t2, _i, key;
+        for (t1 = Object.keys(object), t2 = t1.length, _i = 0; _i < t1.length; t1.length === t2 || (0, H.throwConcurrentModificationError)(t1), ++_i) {
+          key = t1[_i];
+          action.call$2(key, object[key]);
+        }
+      }
+    },
+    convertNativePromiseToDartFuture_closure: {
+      "^": "Closure:0;completer",
+      call$1: [function(result) {
+        return this.completer.complete$1(0, result);
+      }, null, null, 2, 0, null, 14, "call"]
+    },
+    convertNativePromiseToDartFuture_closure0: {
+      "^": "Closure:0;completer",
+      call$1: [function(result) {
+        return this.completer.completeError$1(result);
+      }, null, null, 2, 0, null, 14, "call"]
     }
   }], ["lazy_trace", "package:stack_trace/src/lazy_trace.dart",, S, {
     "^": "",
     LazyTrace: {
-      "^": "Object;_thunk,_inner",
+      "^": "Object;_thunk,_lazy_trace$_inner",
       get$_lazy_trace$_trace: function() {
-        var t1 = this._inner;
+        var t1 = this._lazy_trace$_inner;
         if (t1 == null) {
           t1 = this._thunk$0();
-          this._inner = t1;
+          this._lazy_trace$_inner = t1;
         }
         return t1;
       },
+      get$frames: function() {
+        return this.get$_lazy_trace$_trace().get$frames();
+      },
       get$terse: function() {
         return new S.LazyTrace(new S.LazyTrace_terse_closure(this), null);
       },
+      foldFrames$2$terse: function(predicate, terse) {
+        return new S.LazyTrace(new S.LazyTrace_foldFrames_closure(this, predicate, true), null);
+      },
       toString$0: function(_) {
         return J.toString$0$(this.get$_lazy_trace$_trace());
       },
       _thunk$0: function() {
         return this._thunk.call$0();
       },
       $isTrace: 1
     },
     LazyTrace_terse_closure: {
-      "^": "Closure:1;_lazy_trace$_captured_this_0",
+      "^": "Closure:1;$this",
       call$0: function() {
-        return this._lazy_trace$_captured_this_0.get$_lazy_trace$_trace().get$terse();
+        return this.$this.get$_lazy_trace$_trace().get$terse();
       }
+    },
+    LazyTrace_foldFrames_closure: {
+      "^": "Closure:1;$this,predicate,terse",
+      call$0: function() {
+        return this.$this.get$_lazy_trace$_trace().foldFrames$2$terse(this.predicate, this.terse);
+      }
+    }
+  }], ["", "package:stream_channel/src/multi_channel.dart",, D, {
+    "^": "",
+    _MultiChannel: {
+      "^": "StreamChannelMixin;_multi_channel$_inner,_innerStreamSubscription,_mainController,_controllers,_nextId",
+      virtualChannel$1: function(id) {
+        var t1, t2, inputId, t3, controller;
+        t1 = {};
+        t1.inputId = null;
+        t1.outputId = null;
+        if (id != null) {
+          t1.inputId = id;
+          t1.outputId = H.intTypeCast(id) + 1;
+          t2 = id;
+        } else {
+          t2 = this._nextId;
+          inputId = t2 + 1;
+          t1.inputId = inputId;
+          t1.outputId = t2;
+          this._nextId = t2 + 2;
+          t2 = inputId;
+        }
+        if (this._multi_channel$_inner == null) {
+          t1 = H.setRuntimeTypeInfo(new P._EmptyStream(), [null]);
+          t3 = H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null]);
+          t3._asyncComplete$1(null);
+          return new D.VirtualChannel(this, t2, t1, H.setRuntimeTypeInfo(new N.NullStreamSink(t3, false, false), [null]));
+        }
+        t3 = this._controllers;
+        if (t3.containsKey$1(t2))
+          throw H.wrapException(P.ArgumentError$("A virtual channel with id " + H.S(id) + " already exists."));
+        controller = B.StreamChannelController$(true, true, null);
+        t3.$indexSet(0, t2, controller);
+        t2 = controller._local._streamController;
+        t2.toString;
+        H.setRuntimeTypeInfo(new P._ControllerStream(t2), [H.getTypeArgumentByIndex(t2, 0)]).listen$2$onDone(new D._MultiChannel_virtualChannel_closure(t1, this), new D._MultiChannel_virtualChannel_closure0(t1, this));
+        t1 = t1.outputId;
+        t2 = controller._foreign._streamController;
+        t2.toString;
+        return new D.VirtualChannel(this, t1, H.setRuntimeTypeInfo(new P._ControllerStream(t2), [H.getTypeArgumentByIndex(t2, 0)]), controller._foreign._sink);
+      },
+      _closeChannel$2: function(inputId, outputId) {
+        var t1, t2;
+        t1 = this._controllers;
+        t1.remove$1(0, inputId).get$local()._sink.close$0(0);
+        t2 = this._multi_channel$_inner;
+        if (t2 == null)
+          return;
+        t2._sink.add$1(0, [outputId]);
+        if (t1.get$isEmpty(t1))
+          this._closeInnerChannel$0();
+      },
+      _closeInnerChannel$0: [function() {
+        var t1, t2, t3, _i;
+        this._multi_channel$_inner._sink.close$0(0);
+        this._innerStreamSubscription.cancel$0();
+        this._multi_channel$_inner = null;
+        for (t1 = this._controllers, t2 = P.List_List$from(t1.get$values(t1), true, null), t3 = t2.length, _i = 0; _i < t2.length; t2.length === t3 || (0, H.throwConcurrentModificationError)(t2), ++_i)
+          t2[_i].get$local()._sink.close$0(0);
+        t1.clear$0(0);
+      }, "call$0", "get$_closeInnerChannel", 0, 0, 2],
+      _MultiChannel$1: function(_inner) {
+        var t1, t2;
+        t1 = this._mainController;
+        this._controllers.$indexSet(0, 0, t1);
+        t2 = t1._local._streamController;
+        t2.toString;
+        H.setRuntimeTypeInfo(new P._ControllerStream(t2), [H.getTypeArgumentByIndex(t2, 0)]).listen$2$onDone(new D._MultiChannel_closure(this), new D._MultiChannel_closure0(this));
+        t2 = this._multi_channel$_inner._streamController;
+        t2.toString;
+        this._innerStreamSubscription = H.setRuntimeTypeInfo(new P._ControllerStream(t2), [H.getTypeArgumentByIndex(t2, 0)]).listen$3$onDone$onError(new D._MultiChannel_closure1(this), this.get$_closeInnerChannel(), t1._local._sink.get$addError());
+      },
+      static: {_MultiChannel$: function(_inner) {
+          var t1 = new D._MultiChannel(_inner, null, B.StreamChannelController$(true, true, null), P.LinkedHashMap_LinkedHashMap$_empty(P.$int, B.StreamChannelController), 1);
+          t1._MultiChannel$1(_inner);
+          return t1;
+        }}
+    },
+    _MultiChannel_closure: {
+      "^": "Closure:0;$this",
+      call$1: [function(message) {
+        return this.$this._multi_channel$_inner._sink.add$1(0, [0, message]);
+      }, null, null, 2, 0, null, 7, "call"]
+    },
+    _MultiChannel_closure0: {
+      "^": "Closure:1;$this",
+      call$0: [function() {
+        return this.$this._closeChannel$2(0, 0);
+      }, null, null, 0, 0, null, "call"]
+    },
+    _MultiChannel_closure1: {
+      "^": "Closure:0;$this",
+      call$1: [function(message) {
+        var t1, controller;
+        t1 = J.getInterceptor$asx(message);
+        controller = this.$this._controllers.$index(0, t1.$index(message, 0));
+        if (controller == null)
+          return;
+        if (J.$gt$n(t1.get$length(message), 1)) {
+          controller._local._sink.add$1(0, t1.$index(message, 1));
+          return;
+        }
+        controller._local._sink.close$0(0);
+      }, null, null, 2, 0, null, 7, "call"]
+    },
+    _MultiChannel_virtualChannel_closure: {
+      "^": "Closure:0;_box_0,$this",
+      call$1: [function(message) {
+        return this.$this._multi_channel$_inner._sink.add$1(0, [this._box_0.outputId, message]);
+      }, null, null, 2, 0, null, 7, "call"]
+    },
+    _MultiChannel_virtualChannel_closure0: {
+      "^": "Closure:1;_box_0,$this",
+      call$0: [function() {
+        var t1 = this._box_0;
+        return this.$this._closeChannel$2(t1.inputId, t1.outputId);
+      }, null, null, 0, 0, null, "call"]
+    },
+    VirtualChannel: {
+      "^": "StreamChannelMixin;_parent,id,stream,sink"
     }
   }], ["path", "package:path/path.dart",, B, {
     "^": "",
     current: function() {
       var uri, t1, t2, targetScheme, targetUserInfo, targetHost, targetPort, targetPath, targetQuery, mergedPath, fragment, path;
       uri = P.Uri_base();
+      if (uri.$eq(0, $._currentUriBase))
+        return $._current;
+      $._currentUriBase = uri;
       t1 = $.$get$Style_platform();
       t2 = $.$get$Style_url();
       if (t1 == null ? t2 == null : t1 === t2) {
         t1 = P.Uri_parse(".", 0, null);
         targetScheme = t1.scheme;
         if (targetScheme.length !== 0) {
           if (t1._host != null) {
             targetUserInfo = t1._userInfo;
             targetHost = t1.get$host(t1);
             targetPort = t1._port != null ? t1.get$port(t1) : null;
@@ skipping 50 matching lines @@
               else
                 targetQuery = null;
             }
           }
         }
         fragment = t1._fragment;
         if (fragment != null)
           ;
         else
           fragment = null;
-        return new P.Uri(targetHost, targetPort, targetPath, targetScheme, targetUserInfo, targetQuery, fragment, null, null).toString$0(0);
+        t1 = new P.Uri(targetScheme, targetUserInfo, targetHost, targetPort, targetPath, targetQuery, fragment, null, null).toString$0(0);
+        $._current = t1;
+        return t1;
       } else {
         path = uri.toFilePath$0();
-        return C.JSString_methods.substring$2(path, 0, path.length - 1);
+        t1 = C.JSString_methods.substring$2(path, 0, path.length - 1);
+        $._current = t1;
+        return t1;
       }
     }
   }], ["path.context", "package:path/src/context.dart",, F, {
     "^": "",
     _validateArgList: function(method, args) {
-      var i, numArgs, numArgs0, message, t1, t2;
-      for (i = 1; i < 8; ++i) {
+      var numArgs, i, numArgs0, message, t1, t2, t3, t4;
+      for (numArgs = args.length, i = 1; i < numArgs; ++i) {
         if (args[i] == null || args[i - 1] != null)
           continue;
-        for (numArgs = 8; numArgs >= 1; numArgs = numArgs0) {
+        for (; numArgs >= 1; numArgs = numArgs0) {
           numArgs0 = numArgs - 1;
           if (args[numArgs0] != null)
             break;
         }
         message = new P.StringBuffer("");
         t1 = method + "(";
         message._contents = t1;
-        t2 = new H.SubListIterable(args, 0, numArgs);
-        t2.$builtinTypeInfo = [H.getTypeArgumentByIndex(args, 0)];
-        if (numArgs < 0)
-          H.throwExpression(P.RangeError$range(numArgs, 0, null, "end", null));
-        if (0 > numArgs)
-          H.throwExpression(P.RangeError$range(0, 0, numArgs, "start", null));
-        t2 = new H.MappedListIterable(t2, new F._validateArgList_closure());
-        t2.$builtinTypeInfo = [null, null];
-        t1 += t2.join$1(0, ", ");
+        t2 = H.setRuntimeTypeInfo(new H.SubListIterable(args, 0, numArgs), [H.getTypeArgumentByIndex(args, 0)]);
+        t3 = t2.__internal$_start;
+        if (t3 < 0)
+          H.throwExpression(P.RangeError$range(t3, 0, null, "start", null));
+        t4 = t2._endOrLength;
+        if (t4 != null) {
+          if (typeof t4 !== "number")
+            return t4.$lt();
+          if (t4 < 0)
+            H.throwExpression(P.RangeError$range(t4, 0, null, "end", null));
+          if (t3 > t4)
+            H.throwExpression(P.RangeError$range(t3, 0, t4, "start", null));
+        }
+        t1 += H.setRuntimeTypeInfo(new H.MappedListIterable(t2, new F._validateArgList_closure()), [null, null]).join$1(0, ", ");
         message._contents = t1;
         message._contents = t1 + ("): part " + (i - 1) + " was null, but part " + i + " was not.");
         throw H.wrapException(P.ArgumentError$(message.toString$0(0)));
       }
     },
     Context: {
       "^": "Object;style,_context$_current",
+      absolute$7: function(_, part1, part2, part3, part4, part5, part6, part7) {
+        var t1;
+        F._validateArgList("absolute", [part1, part2, part3, part4, part5, part6, part7]);
+        t1 = this.style;
+        t1 = J.$gt$n(t1.rootLength$1(part1), 0) && !t1.isRootRelative$1(part1);
+        if (t1)
+          return part1;
+        t1 = this._context$_current;
+        return this.join$8(0, t1 != null ? t1 : B.current(), part1, part2, part3, part4, part5, part6, part7);
+      },
+      absolute$1: function($receiver, part1) {
+        return this.absolute$7($receiver, part1, null, null, null, null, null, null);
+      },
       join$8: function(_, part1, part2, part3, part4, part5, part6, part7, part8) {
         var parts = H.setRuntimeTypeInfo([part1, part2, part3, part4, part5, part6, part7, part8], [P.String]);
         F._validateArgList("join", parts);
         return this.joinAll$1(H.setRuntimeTypeInfo(new H.WhereIterable(parts, new F.Context_join_closure()), [H.getTypeArgumentByIndex(parts, 0)]));
       },
       join$2: function($receiver, part1, part2) {
         return this.join$8($receiver, part1, part2, null, null, null, null, null, null);
       },
       joinAll$1: function(parts) {
         var buffer, t1, t2, t3, needsSeparator, isAbsoluteAndNotRootRelative, part, parsed, t4, t5;
         buffer = new P.StringBuffer("");
-        for (t1 = H.setRuntimeTypeInfo(new H.WhereIterable(parts, new F.Context_joinAll_closure()), [H.getRuntimeTypeArgument(parts, "Iterable", 0)]), t1 = H.setRuntimeTypeInfo(new H.WhereIterator(J.get$iterator$ax(t1._iterable), t1._f), [H.getTypeArgumentByIndex(t1, 0)]), t2 = this.style, t3 = t1._iterator, needsSeparator = false, isAbsoluteAndNotRootRelative = false; t1.moveNext$0();) {
+        for (t1 = H.setRuntimeTypeInfo(new H.WhereIterable(parts, new F.Context_joinAll_closure()), [H.getRuntimeTypeArgument(parts, "Iterable", 0)]), t1 = H.setRuntimeTypeInfo(new H.WhereIterator(J.get$iterator$ax(t1.__internal$_iterable), t1._f), [H.getTypeArgumentByIndex(t1, 0)]), t2 = this.style, t3 = t1._iterator, needsSeparator = false, isAbsoluteAndNotRootRelative = false; t1.moveNext$0();) {
           part = t3.get$current();
           if (t2.isRootRelative$1(part) && isAbsoluteAndNotRootRelative) {
             parsed = Q.ParsedPath_ParsedPath$parse(part, t2);
             t4 = buffer._contents;
             t4 = t4.charCodeAt(0) == 0 ? t4 : t4;
             t4 = C.JSString_methods.substring$2(t4, 0, t2.rootLength$1(t4));
             parsed.root = t4;
             if (t2.needsSeparator$1(t4)) {
               t4 = parsed.separators;
               t5 = t2.get$separator();
@@ skipping 26 matching lines @@
         t1 = parsed.parts;
         t1 = H.setRuntimeTypeInfo(new H.WhereIterable(t1, new F.Context_split_closure()), [H.getTypeArgumentByIndex(t1, 0)]);
         t1 = P.List_List$from(t1, true, H.getRuntimeTypeArgument(t1, "Iterable", 0));
         parsed.parts = t1;
         t2 = parsed.root;
         if (t2 != null)
           C.JSArray_methods.insert$2(t1, 0, t2);
         return parsed.parts;
       },
       normalize$1: function(path) {
-        var parsed = Q.ParsedPath_ParsedPath$parse(path, this.style);
+        var parsed;
+        if (!this._needsNormalization$1(path))
+          return path;
+        parsed = Q.ParsedPath_ParsedPath$parse(path, this.style);
         parsed.normalize$0();
         return parsed.toString$0(0);
       },
+      _needsNormalization$1: function(path) {
+        var t1, root, i, start, previous, t2, t3, previousPrevious, t4, codeUnit, t5;
+        t1 = this.style;
+        root = t1.rootLength$1(path);
+        if (!J.$eq$(root, 0)) {
+          if (t1 === $.$get$Style_windows()) {
+            if (typeof root !== "number")
+              return H.iae(root);
+            i = 0;
+            for (; i < root; ++i)
+              if (C.JSString_methods.codeUnitAt$1(path, i) === 47)
+                return true;
+          }
+          start = root;
+          previous = 47;
+        } else {
+          start = 0;
+          previous = null;
+        }
+        for (t2 = new H.CodeUnits(path).__internal$_string, t3 = t2.length, i = start, previousPrevious = null; t4 = J.getInterceptor$n(i), t4.$lt(i, t3); i = t4.$add(i, 1), previousPrevious = previous, previous = codeUnit) {
+          codeUnit = C.JSString_methods.codeUnitAt$1(t2, i);
+          if (t1.isSeparator$1(codeUnit)) {
+            if (t1 === $.$get$Style_windows() && codeUnit === 47)
+              return true;
+            if (previous != null && t1.isSeparator$1(previous))
+              return true;
+            if (previous === 46)
+              t5 = previousPrevious == null || previousPrevious === 46 || t1.isSeparator$1(previousPrevious);
+            else
+              t5 = false;
+            if (t5)
+              return true;
+          }
+        }
+        if (previous == null)
+          return true;
+        if (t1.isSeparator$1(previous))
+          return true;
+        if (previous === 46)
+          t1 = previousPrevious == null || previousPrevious === 47 || previousPrevious === 46;
+        else
+          t1 = false;
+        if (t1)
+          return true;
+        return false;
+      },
       relative$2$from: function(path, from) {
-        var t1, t2, fromParsed, pathParsed, t3;
-        from = this._context$_current;
-        from = from != null ? from : B.current();
+        var t1, fromParsed, pathParsed, t2, t3;
+        if (!J.$gt$n(this.style.rootLength$1(path), 0))
+          return this.normalize$1(path);
+        t1 = this._context$_current;
+        from = t1 != null ? t1 : B.current();
         t1 = this.style;
         if (!J.$gt$n(t1.rootLength$1(from), 0) && J.$gt$n(t1.rootLength$1(path), 0))
           return this.normalize$1(path);
-        if (!J.$gt$n(t1.rootLength$1(path), 0) || t1.isRootRelative$1(path)) {
-          t2 = this._context$_current;
-          path = this.join$8(0, t2 != null ? t2 : B.current(), path, null, null, null, null, null, null);
-        }
+        if (!J.$gt$n(t1.rootLength$1(path), 0) || t1.isRootRelative$1(path))
+          path = this.absolute$1(0, path);
         if (!J.$gt$n(t1.rootLength$1(path), 0) && J.$gt$n(t1.rootLength$1(from), 0))
           throw H.wrapException(new E.PathException("Unable to find a path to \"" + path + "\" from \"" + H.S(from) + "\"."));
         fromParsed = Q.ParsedPath_ParsedPath$parse(from, t1);
         fromParsed.normalize$0();
         pathParsed = Q.ParsedPath_ParsedPath$parse(path, t1);
         pathParsed.normalize$0();
         t2 = fromParsed.parts;
         if (t2.length > 0 && J.$eq$(t2[0], "."))
           return pathParsed.toString$0(0);
         if (!J.$eq$(fromParsed.root, pathParsed.root)) {
@@ skipping 22 matching lines @@
           if (!t2)
             break;
           C.JSArray_methods.removeAt$1(fromParsed.parts, 0);
           C.JSArray_methods.removeAt$1(fromParsed.separators, 1);
           C.JSArray_methods.removeAt$1(pathParsed.parts, 0);
           C.JSArray_methods.removeAt$1(pathParsed.separators, 1);
         }
         t2 = fromParsed.parts;
         if (t2.length > 0 && J.$eq$(t2[0], ".."))
           throw H.wrapException(new E.PathException("Unable to find a path to \"" + path + "\" from \"" + H.S(from) + "\"."));
-        C.JSArray_methods.insertAll$2(pathParsed.parts, 0, P.List_List$filled(fromParsed.parts.length, "..", null));
+        C.JSArray_methods.insertAll$2(pathParsed.parts, 0, P.List_List$filled(fromParsed.parts.length, "..", false, null));
         t2 = pathParsed.separators;
         if (0 >= t2.length)
           return H.ioore(t2, 0);
         t2[0] = "";
-        C.JSArray_methods.insertAll$2(t2, 1, P.List_List$filled(fromParsed.parts.length, t1.get$separator(), null));
+        C.JSArray_methods.insertAll$2(t2, 1, P.List_List$filled(fromParsed.parts.length, t1.get$separator(), false, null));
         t1 = pathParsed.parts;
         t2 = t1.length;
         if (t2 === 0)
           return ".";
         if (t2 > 1 && J.$eq$(C.JSArray_methods.get$last(t1), ".")) {
           C.JSArray_methods.removeLast$0(pathParsed.parts);
           t1 = pathParsed.separators;
           C.JSArray_methods.removeLast$0(t1);
           C.JSArray_methods.removeLast$0(t1);
           C.JSArray_methods.add$1(t1, "");
@@ skipping 44 matching lines @@
         if (t1)
           return uri.toString$0(0);
         path = this.normalize$1(this.fromUri$1(uri));
         rel = this.relative$1(path);
         return this.split$1(0, rel).length > this.split$1(0, path).length ? path : rel;
       },
       static: {Context_Context: function(current, style) {
           current = style == null ? B.current() : ".";
           if (style == null)
             style = $.$get$Style_platform();
-          else if (!style.$isInternalStyle)
-            throw H.wrapException(P.ArgumentError$("Only styles defined by the path package are allowed."));
-          return new F.Context(H.interceptedTypeCast(style, "$isInternalStyle"), current);
+          return new F.Context(style, current);
         }}
     },
     Context_join_closure: {
       "^": "Closure:0;",
       call$1: function(part) {
         return part != null;
       }
     },
     Context_joinAll_closure: {
       "^": "Closure:0;",
       call$1: function(part) {
         return !J.$eq$(part, "");
       }
     },
     Context_split_closure: {
       "^": "Closure:0;",
       call$1: function(part) {
         return J.get$isEmpty$asx(part) !== true;
       }
     },
     _validateArgList_closure: {
       "^": "Closure:0;",
       call$1: [function(arg) {
         return arg == null ? "null" : "\"" + H.S(arg) + "\"";
-      }, null, null, 2, 0, null, 9, "call"]
+      }, null, null, 2, 0, null, 13, "call"]
     }
   }], ["path.internal_style", "package:path/src/internal_style.dart",, E, {
     "^": "",
     InternalStyle: {
       "^": "Style;",
       getRoot$1: function(path) {
         var $length = this.rootLength$1(path);
         if (J.$gt$n($length, 0))
           return J.substring$2$s(path, 0, $length);
         return this.isRootRelative$1(path) ? J.$index$asx(path, 0) : null;
@@ skipping 43 matching lines @@
             ;
           else if (t3.$eq(part, ".."))
             if (newParts.length > 0)
               newParts.pop();
             else
               ++leadingDoubles;
           else
             newParts.push(part);
         }
         if (this.root == null)
-          C.JSArray_methods.insertAll$2(newParts, 0, P.List_List$filled(leadingDoubles, "..", null));
+          C.JSArray_methods.insertAll$2(newParts, 0, P.List_List$filled(leadingDoubles, "..", false, null));
         if (newParts.length === 0 && this.root == null)
           newParts.push(".");
         newSeparators = P.List_List$generate(newParts.length, new Q.ParsedPath_normalize_closure(this), true, P.String);
         t1 = this.root;
         C.JSArray_methods.insert$2(newSeparators, 0, t1 != null && newParts.length > 0 && this.style.needsSeparator$1(t1) ? this.style.get$separator() : "");
         this.parts = newParts;
         this.separators = newSeparators;
         t1 = this.root;
         if (t1 != null) {
           t2 = this.style;
@@ skipping 59 matching lines @@
           if (typeof t2 !== "number")
             return H.iae(t2);
           if (start < t2) {
             parts.push(t1.substring$1(path, start));
             separators.push("");
           }
           return new Q.ParsedPath(style, root, isRootRelative, parts, separators);
         }}
     },
     ParsedPath_normalize_closure: {
-      "^": "Closure:0;_parsed_path$_captured_this_0",
+      "^": "Closure:0;$this",
       call$1: function(_) {
-        return this._parsed_path$_captured_this_0.style.get$separator();
+        return this.$this.style.get$separator();
       }
     }
   }], ["path.path_exception", "package:path/src/path_exception.dart",, E, {
     "^": "",
     PathException: {
       "^": "Object;message>",
       toString$0: function(_) {
         return "PathException: " + this.message;
       }
     }
@@ skipping 32 matching lines @@
         var t1 = J.getInterceptor$asx(path);
         if (t1.get$isNotEmpty(path) && t1.codeUnitAt$1(path, 0) === 47)
           return 1;
         return 0;
       },
       isRootRelative$1: function(path) {
         return false;
       },
       pathFromUri$1: function(uri) {
         var t1 = uri.scheme;
-        if (t1 === "" || t1 === "file")
-          return P.Uri__uriDecode(uri._path, C.Utf8Codec_false, false);
+        if (t1 === "" || t1 === "file") {
+          t1 = uri._path;
+          return P.Uri__uriDecode(t1, 0, t1.length, C.Utf8Codec_false, false);
+        }
         throw H.wrapException(P.ArgumentError$("Uri " + uri.toString$0(0) + " must have scheme 'file:'."));
       },
       absolutePathToUri$1: function(path) {
         var parsed, t1;
         parsed = Q.ParsedPath_ParsedPath$parse(path, this);
         t1 = parsed.parts;
         if (t1.length === 0)
           C.JSArray_methods.addAll$1(t1, ["", ""]);
         else if (parsed.get$hasTrailingSeparator())
           C.JSArray_methods.add$1(parsed.parts, "");
@@ skipping 109 matching lines @@
         t1 = uri.scheme;
         if (t1 !== "" && t1 !== "file")
           throw H.wrapException(P.ArgumentError$("Uri " + uri.toString$0(0) + " must have scheme 'file:'."));
         path = uri._path;
         if (uri.get$host(uri) === "") {
           if (C.JSString_methods.startsWith$1(path, "/"))
             path = C.JSString_methods.replaceFirst$2(path, "/", "");
         } else
           path = "\\\\" + H.S(uri.get$host(uri)) + path;
         H.checkString("\\");
-        return P.Uri__uriDecode(H.stringReplaceAllUnchecked(path, "/", "\\"), C.Utf8Codec_false, false);
+        t1 = H.stringReplaceAllUnchecked(path, "/", "\\");
+        return P.Uri__uriDecode(t1, 0, t1.length, C.Utf8Codec_false, false);
       },
       absolutePathToUri$1: function(path) {
         var parsed, t1, rootParts, t2;
         parsed = Q.ParsedPath_ParsedPath$parse(path, this);
         if (J.startsWith$1$s(parsed.root, "\\\\")) {
           t1 = J.split$1$s(parsed.root, "\\");
           rootParts = H.setRuntimeTypeInfo(new H.WhereIterable(t1, new T.WindowsStyle_absolutePathToUri_closure()), [H.getTypeArgumentByIndex(t1, 0)]);
           C.JSArray_methods.insert$2(parsed.parts, 0, rootParts.get$last(rootParts));
           if (parsed.get$hasTrailingSeparator())
             C.JSArray_methods.add$1(parsed.parts, "");
           return P.Uri_Uri(null, rootParts.get$first(rootParts), null, parsed.parts, null, null, null, "file", "");
         } else {
           if (parsed.parts.length === 0 || parsed.get$hasTrailingSeparator())
             C.JSArray_methods.add$1(parsed.parts, "");
           t1 = parsed.parts;
           t2 = J.replaceAll$2$s(parsed.root, "/", "");
           H.checkString("");
           C.JSArray_methods.insert$2(t1, 0, H.stringReplaceAllUnchecked(t2, "\\", ""));
           return P.Uri_Uri(null, null, null, parsed.parts, null, null, null, "file", "");
         }
       }
     },
     WindowsStyle_absolutePathToUri_closure: {
       "^": "Closure:0;",
       call$1: function(part) {
         return !J.$eq$(part, "");
       }
     }
+  }], ["stack_trace.chain", "package:stack_trace/src/chain.dart",, O, {
+    "^": "",
+    Chain: {
+      "^": "Object;traces",
+      get$terse: function() {
+        return this.foldFrames$2$terse(new O.Chain_terse_closure(), true);
+      },
+      foldFrames$2$terse: function(predicate, terse) {
+        var t1, foldedTraces, nonEmptyTraces;
+        t1 = this.traces;
+        foldedTraces = t1.map$1(t1, new O.Chain_foldFrames_closure(predicate, true));
+        nonEmptyTraces = foldedTraces.super$Iterable$where(foldedTraces, new O.Chain_foldFrames_closure0(true));
+        if (!nonEmptyTraces.get$iterator(nonEmptyTraces).moveNext$0() && !foldedTraces.get$isEmpty(foldedTraces))
+          return new O.Chain(H.setRuntimeTypeInfo(new P.UnmodifiableListView(C.JSArray_methods.toList$0([foldedTraces.get$last(foldedTraces)])), [R.Trace]));
+        return new O.Chain(H.setRuntimeTypeInfo(new P.UnmodifiableListView(nonEmptyTraces.toList$0(0)), [R.Trace]));
+      },
+      toTrace$0: function() {
+        var t1 = this.traces;
+        return new R.Trace(H.setRuntimeTypeInfo(new P.UnmodifiableListView(C.JSArray_methods.toList$0(N.flatten(t1.map$1(t1, new O.Chain_toTrace_closure())))), [S.Frame]));
+      },
+      toString$0: function(_) {
+        var t1 = this.traces;
+        return t1.map$1(t1, new O.Chain_toString_closure(t1.map$1(t1, new O.Chain_toString_closure0()).fold$2(0, 0, P.math__max$closure()))).join$1(0, "===== asynchronous gap ===========================\n");
+      },
+      static: {Chain_Chain$parse: function(chain) {
+          var t1 = J.getInterceptor$asx(chain);
+          if (t1.get$isEmpty(chain) === true)
+            return new O.Chain(H.setRuntimeTypeInfo(new P.UnmodifiableListView(C.JSArray_methods.toList$0([])), [R.Trace]));
+          if (t1.contains$1(chain, "===== asynchronous gap ===========================\n") !== true)
+            return new O.Chain(H.setRuntimeTypeInfo(new P.UnmodifiableListView(C.JSArray_methods.toList$0([R.Trace_Trace$parse(chain)])), [R.Trace]));
+          return new O.Chain(H.setRuntimeTypeInfo(new P.UnmodifiableListView(H.setRuntimeTypeInfo(new H.MappedListIterable(t1.split$1(chain, "===== asynchronous gap ===========================\n"), new O.closure2()), [null, null]).toList$0(0)), [R.Trace]));
+        }}
+    },
+    closure2: {
+      "^": "Closure:0;",
+      call$1: [function(trace) {
+        return R.Trace$parseFriendly(trace);
+      }, null, null, 2, 0, null, 11, "call"]
+    },
+    Chain_terse_closure: {
+      "^": "Closure:0;",
+      call$1: function(_) {
+        return false;
+      }
+    },
+    Chain_foldFrames_closure: {
+      "^": "Closure:0;predicate,terse",
+      call$1: [function(trace) {
+        return trace.foldFrames$2$terse(this.predicate, this.terse);
+      }, null, null, 2, 0, null, 11, "call"]
+    },
+    Chain_foldFrames_closure0: {
+      "^": "Closure:0;terse",
+      call$1: function(trace) {
+        var t1;
+        if (trace.get$frames()._collection$_source.length > 1)
+          return true;
+        t1 = trace.get$frames();
+        if (t1.get$isEmpty(t1))
+          return false;
+        if (!this.terse)
+          return false;
+        t1 = trace.get$frames();
+        return t1.get$single(t1).get$line() != null;
+      }
+    },
+    Chain_toTrace_closure: {
+      "^": "Closure:0;",
+      call$1: [function(trace) {
+        return trace.get$frames();
+      }, null, null, 2, 0, null, 11, "call"]
+    },
+    Chain_toString_closure0: {
+      "^": "Closure:0;",
+      call$1: [function(trace) {
+        var t1 = trace.get$frames();
+        return t1.map$1(t1, new O.Chain_toString__closure0()).fold$2(0, 0, P.math__max$closure());
+      }, null, null, 2, 0, null, 11, "call"]
+    },
+    Chain_toString__closure0: {
+      "^": "Closure:0;",
+      call$1: [function(frame) {
+        return J.get$length$asx(J.get$location$x(frame));
+      }, null, null, 2, 0, null, 12, "call"]
+    },
+    Chain_toString_closure: {
+      "^": "Closure:0;longest",
+      call$1: [function(trace) {
+        var t1 = trace.get$frames();
+        return t1.map$1(t1, new O.Chain_toString__closure(this.longest)).join$0(0);
+      }, null, null, 2, 0, null, 11, "call"]
+    },
+    Chain_toString__closure: {
+      "^": "Closure:0;longest",
+      call$1: [function(frame) {
+        return H.S(N.padRight(J.get$location$x(frame), this.longest)) + "  " + H.S(frame.get$member()) + "\n";
+      }, null, null, 2, 0, null, 12, "call"]
+    }
   }], ["stack_trace.src.utils", "package:stack_trace/src/utils.dart",, N, {
     "^": "",
     padRight: function(string, $length) {
       var t1, t2, result, i;
       t1 = J.getInterceptor$asx(string);
       t2 = t1.get$length(string);
       if (typeof $length !== "number")
         return H.iae($length);
       if (t2 >= $length)
         return string;
       result = new P.StringBuffer("");
       result._contents = H.S(string);
       for (i = 0; i < $length - t1.get$length(string); ++i)
         result._contents += " ";
       t1 = result._contents;
       return t1.charCodeAt(0) == 0 ? t1 : t1;
+    },
+    flatten: function(nested) {
+      var result = [];
+      new N.flatten_helper(result).call$1(nested);
+      return result;
+    },
+    flatten_helper: {
+      "^": "Closure:0;result",
+      call$1: function(list) {
+        var t1, t2, element;
+        for (t1 = J.get$iterator$ax(list), t2 = this.result; t1.moveNext$0();) {
+          element = t1.get$current();
+          if (!!J.getInterceptor(element).$isList)
+            this.call$1(element);
+          else
+            t2.push(element);
+        }
+      }
     }
-  }], ["test.multi_channel", "package:test/src/util/multi_channel.dart",, V, {
+  }], ["stack_trace.unparsed_frame", "package:stack_trace/src/unparsed_frame.dart",, N, {
     "^": "",
-    _MultiChannel: {
-      "^": "StreamChannelMixin;_innerStream,_innerSink,_innerStreamSubscription,_streamController,_sinkController,_streamControllers,_sinkControllers,_nextId",
-      virtualChannel$1: function(id) {
-        var t1, t2, inputId, t3, streamController, sinkController;
-        t1 = {};
-        if (this._innerStream == null)
-          throw H.wrapException(new P.StateError("The underlying channel is closed."));
-        t1._captured_inputId_0 = null;
-        t1._captured_outputId_1 = null;
-        if (id != null) {
-          t1._captured_inputId_0 = id;
-          t1._captured_outputId_1 = H.intTypeCast(id) + 1;
-          t2 = id;
-        } else {
-          t2 = this._nextId;
-          inputId = t2 + 1;
-          t1._captured_inputId_0 = inputId;
-          t1._captured_outputId_1 = t2;
-          this._nextId = t2 + 2;
-          t2 = inputId;
-        }
-        t3 = this._streamControllers;
-        if (t3.containsKey$1(t2))
-          throw H.wrapException(P.ArgumentError$("A virtual channel with id " + H.S(id) + " already exists."));
-        streamController = P.StreamController_StreamController(null, null, null, null, true, null);
-        sinkController = P.StreamController_StreamController(null, null, null, null, true, null);
-        t3.$indexSet(0, t2, streamController);
-        this._sinkControllers.$indexSet(0, t2, sinkController);
-        H.setRuntimeTypeInfo(new P._ControllerStream(sinkController), [H.getTypeArgumentByIndex(sinkController, 0)]).listen$2$onDone(new V._MultiChannel_virtualChannel_closure(t1, this), new V._MultiChannel_virtualChannel_closure0(t1, this));
-        return new V.VirtualChannel(this, t1._captured_outputId_1, H.setRuntimeTypeInfo(new P._ControllerStream(streamController), [H.getTypeArgumentByIndex(streamController, 0)]), H.setRuntimeTypeInfo(new P._StreamSinkWrapper(sinkController), [H.getTypeArgumentByIndex(sinkController, 0)]));
+    UnparsedFrame: {
+      "^": "Object;uri<,line<,column<,isCore<,library<,$package<,location>,member<",
+      toString$0: function(_) {
+        return this.member;
+      }
+    }
+  }], ["", "package:stream_channel/stream_channel.dart",, R, {
+    "^": "",
+    StreamChannelMixin: {
+      "^": "Object;"
+    }
+  }], ["", "package:stream_channel/src/stream_channel_controller.dart",, B, {
+    "^": "",
+    StreamChannelController: {
+      "^": "Object;_local,_foreign",
+      get$local: function() {
+        return this._local;
       },
-      _closeChannel$2: function(inputId, outputId) {
-        var t1, t2;
-        t1 = this._streamControllers;
-        J.close$0$x(t1.remove$1(0, inputId));
-        J.close$0$x(this._sinkControllers.remove$1(0, inputId));
-        t2 = this._innerSink;
-        if (t2 == null)
-          return;
-        t2 = t2._async$_target;
-        if (t2._state >= 4)
-          H.throwExpression(t2._badEventState$0());
-        t2._async$_add$1([outputId]);
-        if (t1.get$isEmpty(t1))
-          this._closeInnerChannel$0();
+      StreamChannelController$2$allowForeignErrors$sync: function(allowForeignErrors, sync, $T) {
+        var localToForeignController, foreignToLocalController;
+        localToForeignController = P.StreamController_StreamController(null, null, null, null, true, $T);
+        foreignToLocalController = P.StreamController_StreamController(null, null, null, null, true, $T);
+        this._local = K.GuaranteeChannel$(H.setRuntimeTypeInfo(new P._ControllerStream(foreignToLocalController), [H.getTypeArgumentByIndex(foreignToLocalController, 0)]), H.setRuntimeTypeInfo(new P._StreamSinkWrapper(localToForeignController), [H.getTypeArgumentByIndex(localToForeignController, 0)]), true, null);
+        this._foreign = K.GuaranteeChannel$(H.setRuntimeTypeInfo(new P._ControllerStream(localToForeignController), [H.getTypeArgumentByIndex(localToForeignController, 0)]), H.setRuntimeTypeInfo(new P._StreamSinkWrapper(foreignToLocalController), [H.getTypeArgumentByIndex(foreignToLocalController, 0)]), true, null);
       },
-      _closeInnerChannel$0: [function() {
-        var t1, t2, _i;
-        this._innerSink._async$_target.close$0(0);
-        this._innerStreamSubscription.cancel$0();
-        this._innerStream = null;
-        this._innerSink = null;
-        for (t1 = this._sinkControllers, t1 = t1.get$values(t1), t1 = P.List_List$from(t1, true, H.getRuntimeTypeArgument(t1, "Iterable", 0)), t2 = t1.length, _i = 0; _i < t1.length; t1.length === t2 || (0, H.throwConcurrentModificationError)(t1), ++_i)
-          J.close$0$x(t1[_i]);
-      }, "call$0", "get$_closeInnerChannel", 0, 0, 2],
-      _MultiChannel$2: function(_innerStream, _innerSink) {
-        var t1, t2;
-        t1 = this._streamController;
-        this._streamControllers.$indexSet(0, 0, t1);
-        t2 = this._sinkController;
-        this._sinkControllers.$indexSet(0, 0, t2);
-        H.setRuntimeTypeInfo(new P._ControllerStream(t2), [H.getTypeArgumentByIndex(t2, 0)]).listen$2$onDone(new V._MultiChannel_closure(this), new V._MultiChannel_closure0(this));
-        this._innerStreamSubscription = this._innerStream.listen$3$onDone$onError(new V._MultiChannel_closure1(this), this.get$_closeInnerChannel(), t1.get$addError());
-      },
-      static: {_MultiChannel$: function(_innerStream, _innerSink) {
-          var t1 = new V._MultiChannel(_innerStream, _innerSink, null, P.StreamController_StreamController(null, null, null, null, true, null), P.StreamController_StreamController(null, null, null, null, true, null), P.LinkedHashMap_LinkedHashMap(null, null, null, P.$int, P.StreamController), P.LinkedHashMap_LinkedHashMap(null, null, null, P.$int, P.StreamController), 1);
-          t1._MultiChannel$2(_innerStream, _innerSink);
+      static: {StreamChannelController$: function(allowForeignErrors, sync, $T) {
+          var t1 = H.setRuntimeTypeInfo(new B.StreamChannelController(null, null), [$T]);
+          t1.StreamChannelController$2$allowForeignErrors$sync(true, true, $T);
           return t1;
         }}
-    },
-    _MultiChannel_closure: {
-      "^": "Closure:0;_multi_channel$_captured_this_0",
-      call$1: [function(message) {
-        var t1 = this._multi_channel$_captured_this_0._innerSink._async$_target;
-        if (t1._state >= 4)
-          H.throwExpression(t1._badEventState$0());
-        t1._async$_add$1([0, message]);
-        return;
-      }, null, null, 2, 0, null, 6, "call"]
-    },
-    _MultiChannel_closure0: {
-      "^": "Closure:1;_captured_this_1",
-      call$0: [function() {
-        return this._captured_this_1._closeChannel$2(0, 0);
-      }, null, null, 0, 0, null, "call"]
-    },
-    _MultiChannel_closure1: {
-      "^": "Closure:0;_multi_channel$_captured_this_2",
-      call$1: [function(message) {
-        var t1, id, t2, sink;
-        t1 = J.getInterceptor$asx(message);
-        id = t1.$index(message, 0);
-        t2 = this._multi_channel$_captured_this_2;
-        sink = t2._streamControllers.$index(0, id);
-        if (sink == null)
-          return;
-        if (J.$gt$n(t1.get$length(message), 1)) {
-          J.add$1$ax(sink, t1.$index(message, 1));
-          return;
-        }
-        J.close$0$x(t2._sinkControllers.$index(0, id));
-      }, null, null, 2, 0, null, 6, "call"]
-    },
-    _MultiChannel_virtualChannel_closure: {
-      "^": "Closure:0;_multi_channel$_box_0,_captured_this_1",
-      call$1: [function(message) {
-        var t1, t2;
-        t1 = this._captured_this_1._innerSink;
-        t2 = this._multi_channel$_box_0._captured_outputId_1;
-        t1 = t1._async$_target;
-        if (t1._state >= 4)
-          H.throwExpression(t1._badEventState$0());
-        t1._async$_add$1([t2, message]);
-        return;
-      }, null, null, 2, 0, null, 6, "call"]
-    },
-    _MultiChannel_virtualChannel_closure0: {
-      "^": "Closure:1;_multi_channel$_box_0,_multi_channel$_captured_this_2",
-      call$0: [function() {
-        var t1 = this._multi_channel$_box_0;
-        return this._multi_channel$_captured_this_2._closeChannel$2(t1._captured_inputId_0, t1._captured_outputId_1);
-      }, null, null, 0, 0, null, "call"]
-    },
-    VirtualChannel: {
-      "^": "StreamChannelMixin;_parent,id,stream,sink"
-    }
-  }], ["test.runner.browser.host", "host.dart",, R, {
-    "^": "",
-    main: [function() {
-      var testRunner = J.$index$asx($.$get$context(), "testRunner");
-      if (testRunner != null)
-        testRunner.callMethod$2("waitUntilDone", []);
-      P.runZoned(new R.main_closure(), new R.main_closure0(), null, null);
-    }, "call$0", "host__main$closure", 0, 0, 2],
-    _connectToServer: function() {
-      var currentUrl, t1, webSocket, inputController, outputController;
-      currentUrl = P.Uri_parse(window.location.href, 0, null);
-      t1 = currentUrl._queryParameters;
-      if (t1 == null) {
-        t1 = currentUrl._query;
-        t1 = H.setRuntimeTypeInfo(new P.UnmodifiableMapView(P.Uri_splitQueryString(t1 == null ? "" : t1, C.Utf8Codec_false)), [null, null]);
-        currentUrl._queryParameters = t1;
-      }
-      webSocket = W.WebSocket_WebSocket(J.$index$asx(t1._collection$_map, "managerUrl"), null);
-      inputController = P.StreamController_StreamController(null, null, null, null, true, null);
-      t1 = H.setRuntimeTypeInfo(new W._EventStream(webSocket, "message", false), [null]);
-      H.setRuntimeTypeInfo(new W._EventStreamSubscription(0, t1._target, t1._eventType, W._wrapZone(new R._connectToServer_closure(inputController)), t1._useCapture), [H.getTypeArgumentByIndex(t1, 0)])._tryResume$0();
-      outputController = P.StreamController_StreamController(null, null, null, null, true, null);
-      H.setRuntimeTypeInfo(new P._ControllerStream(outputController), [H.getTypeArgumentByIndex(outputController, 0)]).listen$1(new R._connectToServer_closure0(webSocket));
-      return V._MultiChannel$(H.setRuntimeTypeInfo(new P._ControllerStream(inputController), [H.getTypeArgumentByIndex(inputController, 0)]), H.setRuntimeTypeInfo(new P._StreamSinkWrapper(outputController), [H.getTypeArgumentByIndex(outputController, 0)]));
-    },
-    _connectToIframe: function(url, id) {
-      var iframe, inputController, outputController, readyCompleter, t1;
-      iframe = document.createElement("iframe", null);
-      $.$get$_iframes().$indexSet(0, id, iframe);
-      J.set$src$x(iframe, url);
-      document.body.appendChild(iframe);
-      inputController = P.StreamController_StreamController(null, null, null, null, true, null);
-      outputController = P.StreamController_StreamController(null, null, null, null, true, null);
-      readyCompleter = H.setRuntimeTypeInfo(new P._AsyncCompleter(H.setRuntimeTypeInfo(new P._Future(0, $.Zone__current, null), [null])), [null]);
-      t1 = H.setRuntimeTypeInfo(new W._EventStream(window, "message", false), [null]);
-      H.setRuntimeTypeInfo(new W._EventStreamSubscription(0, t1._target, t1._eventType, W._wrapZone(new R._connectToIframe_closure(iframe, inputController, readyCompleter)), t1._useCapture), [H.getTypeArgumentByIndex(t1, 0)])._tryResume$0();
-      H.setRuntimeTypeInfo(new P._ControllerStream(outputController), [H.getTypeArgumentByIndex(outputController, 0)]).listen$1(new R._connectToIframe_closure0(iframe, readyCompleter));
-      return H.setRuntimeTypeInfo(new A._StreamChannel(H.setRuntimeTypeInfo(new P._ControllerStream(inputController), [H.getTypeArgumentByIndex(inputController, 0)]), H.setRuntimeTypeInfo(new P._StreamSinkWrapper(outputController), [H.getTypeArgumentByIndex(outputController, 0)])), [null]);
-    },
-    main_closure: {
-      "^": "Closure:1;",
-      call$0: [function() {
-        var serverChannel, t1;
-        serverChannel = R._connectToServer();
-        t1 = serverChannel._streamController;
-        H.setRuntimeTypeInfo(new P._ControllerStream(t1), [H.getTypeArgumentByIndex(t1, 0)]).listen$1(new R.main__closure(serverChannel));
-        t1 = J.get$onClick$x(document.querySelector("#play"));
-        H.setRuntimeTypeInfo(new W._EventStreamSubscription(0, t1._target, t1._eventType, W._wrapZone(new R.main__closure0(serverChannel)), t1._useCapture), [H.getTypeArgumentByIndex(t1, 0)])._tryResume$0();
-      }, null, null, 0, 0, null, "call"]
-    },
-    main__closure: {
-      "^": "Closure:0;_captured_serverChannel_0",
-      call$1: [function(message) {
-        var t1, suiteChannel, iframeChannel;
-        t1 = J.getInterceptor$asx(message);
-        if (J.$eq$(t1.$index(message, "command"), "loadSuite")) {
-          suiteChannel = this._captured_serverChannel_0.virtualChannel$1(t1.$index(message, "channel"));
-          iframeChannel = R._connectToIframe(t1.$index(message, "url"), t1.$index(message, "id"));
-          suiteChannel.stream.pipe$1(iframeChannel.sink);
-          iframeChannel.stream.pipe$1(suiteChannel.sink);
-        } else if (J.$eq$(t1.$index(message, "command"), "displayPause")) {
-          t1 = document.body;
-          t1.toString;
-          W._ElementCssClassSet__add(t1, "paused");
-        } else if (J.$eq$(t1.$index(message, "command"), "resume")) {
-          t1 = document.body;
-          t1.toString;
-          W._ElementCssClassSet__remove(t1, "paused");
-        } else
-          J.remove$0$ax($.$get$_iframes().$index(0, t1.$index(message, "id")));
-      }, null, null, 2, 0, null, 6, "call"]
-    },
-    main__closure0: {
-      "^": "Closure:0;_captured_serverChannel_1",
-      call$1: [function(_) {
-        var t1, t2;
-        t1 = document.body;
-        t1.toString;
-        W._ElementCssClassSet__remove(t1, "paused");
-        t1 = this._captured_serverChannel_1._sinkController;
-        t1 = H.setRuntimeTypeInfo(new P._StreamSinkWrapper(t1), [H.getTypeArgumentByIndex(t1, 0)]);
-        t2 = P.LinkedHashMap__makeLiteral(["command", "resume"]);
-        t1 = t1._async$_target;
-        if (t1._state >= 4)
-          H.throwExpression(t1._badEventState$0());
-        t1._async$_add$1(t2);
-      }, null, null, 2, 0, null, 11, "call"]
-    },
-    main_closure0: {
-      "^": "Closure:3;",
-      call$2: [function(error, stackTrace) {
-        P.print(H.S(error) + "\n" + H.S(R.Trace_Trace$from(stackTrace).get$terse()));
-      }, null, null, 4, 0, null, 3, 4, "call"]
-    },
-    _connectToServer_closure: {
-      "^": "Closure:0;_captured_inputController_0",
-      call$1: [function(message) {
-        var t1, t2;
-        t1 = this._captured_inputController_0;
-        t2 = C.JsonCodec_null_null.decode$1(J.get$data$x(message));
-        if (t1._state >= 4)
-          H.throwExpression(t1._badEventState$0());
-        t1._async$_add$1(t2);
-      }, null, null, 2, 0, null, 6, "call"]
-    },
-    _connectToServer_closure0: {
-      "^": "Closure:0;_captured_webSocket_1",
-      call$1: [function(message) {
-        return this._captured_webSocket_1.send(C.JsonCodec_null_null.encode$1(message));
-      }, null, null, 2, 0, null, 6, "call"]
-    },
-    _connectToIframe_closure: {
-      "^": "Closure:0;_captured_iframe_0,_captured_inputController_1,_captured_readyCompleter_2",
-      call$1: [function(message) {
-        var t1, t2, t3;
-        t1 = J.getInterceptor$x(message);
-        t2 = t1.get$origin(message);
-        t3 = window.location;
-        if (t2 !== (t3 && C.Location_methods).get$origin(t3))
-          return;
-        if (!J.$eq$(J.$index$asx(t1.get$data(message), "href"), J.get$src$x(this._captured_iframe_0)))
-          return;
-        t1.stopPropagation$0(message);
-        t2 = this._captured_inputController_1;
-        t1 = J.$index$asx(t1.get$data(message), "data");
-        if (t2._state >= 4)
-          H.throwExpression(t2._badEventState$0());
-        t2._async$_add$1(t1);
-        t1 = this._captured_readyCompleter_2;
-        if (t1.future._state === 0)
-          t1.complete$0(0);
-      }, null, null, 2, 0, null, 6, "call"]
-    },
-    _connectToIframe_closure0: {
-      "^": "Closure:52;_captured_iframe_3,_captured_readyCompleter_4",
-      call$1: [function(message) {
-        var $async$goto = 0, $async$completer = new P.Completer_Completer(), $async$handler = 1, $async$currentError, $async$self = this, t1, t2, $async$temp1, $async$temp2, $async$temp3, $async$temp4;
-        function $async$call$1($async$errorCode, $async$result) {
-          if ($async$errorCode === 1) {
-            $async$currentError = $async$result;
-            $async$goto = $async$handler;
-          }
-          while (true)
-            switch ($async$goto) {
-              case 0:
-                // Function start
-                $async$temp1 = $async$self;
-                $async$temp1 = $async$temp1._captured_readyCompleter_4;
-                $async$goto = 2;
-                return H.asyncHelper($async$temp1.future, $async$call$1, $async$completer);
-              case 2:
-                // returning from await.
-                $async$temp1 = J;
-                $async$temp1 = $async$temp1;
-                $async$temp2 = $async$self;
-                t1 = $async$temp1.get$contentWindow$x($async$temp2._captured_iframe_3);
-                t2 = window.location;
-                $async$temp1 = J;
-                $async$temp1 = $async$temp1;
-                $async$temp2 = t1;
-                $async$temp3 = message;
-                $async$temp4 = t2;
-                if ($async$temp4) {
-                  // goto then
-                  $async$goto = 3;
-                  break;
-                } else
-                  $async$result = $async$temp4;
-                // goto join
-                $async$goto = 4;
-                break;
-              case 3:
-                // then
-                $async$temp4 = C;
-                $async$result = $async$temp4.Location_methods;
-              case 4:
-                // join
-                $async$temp4 = $async$result;
-                $async$temp1.postMessage$2$x($async$temp2, $async$temp3, $async$temp4.get$origin(t2));
-                // implicit return
-                return H.asyncHelper(null, 0, $async$completer, null);
-              case 1:
-                // rethrow
-                return H.asyncHelper($async$currentError, 1, $async$completer);
-            }
-        }
-        return H.asyncHelper(null, $async$call$1, $async$completer, null);
-      }, null, null, 2, 0, null, 6, "call"]
-    }
-  }, 1], ["test.stream_channel", "package:test/src/util/stream_channel.dart",, A, {
-    "^": "",
-    _StreamChannel: {
-      "^": "StreamChannelMixin;stream,sink"
-    },
-    StreamChannelMixin: {
-      "^": "Object;"
     }
   }], ["trace", "package:stack_trace/src/trace.dart",, R, {
     "^": "",
     Trace: {
-      "^": "Object;frames",
+      "^": "Object;frames<",
       get$terse: function() {
         return this.foldFrames$2$terse(new R.Trace_terse_closure(), true);
       },
       foldFrames$2$terse: function(predicate, terse) {
         var t1, newFrames, t2, frame;
         t1 = {};
-        t1._captured_predicate_0 = predicate;
-        if (terse)
-          t1._captured_predicate_0 = new R.Trace_foldFrames_closure(predicate);
+        t1.predicate = predicate;
+        t1.predicate = new R.Trace_foldFrames_closure(predicate);
         newFrames = [];
         for (t2 = this.frames, t2 = t2.get$reversed(t2), t2 = new H.ListIterator(t2, t2.get$length(t2), 0, null); t2.moveNext$0();) {
-          frame = t2.__internal$_current;
-          if (t1._captured_predicate_0.call$1(frame) !== true)
+          frame = t2._current;
+          if (frame instanceof N.UnparsedFrame || t1.predicate.call$1(frame) !== true)
             newFrames.push(frame);
-          else if (newFrames.length === 0 || t1._captured_predicate_0.call$1(C.JSArray_methods.get$last(newFrames)) !== true)
+          else if (newFrames.length === 0 || t1.predicate.call$1(C.JSArray_methods.get$last(newFrames)) !== true)
             newFrames.push(new S.Frame(frame.get$uri(), frame.get$line(), frame.get$column(), frame.get$member()));
         }
-        if (terse) {
-          newFrames = H.setRuntimeTypeInfo(new H.MappedListIterable(newFrames, new R.Trace_foldFrames_closure0(t1)), [null, null]).toList$0(0);
-          if (newFrames.length > 1 && C.JSArray_methods.get$first(newFrames).get$isCore())
-            C.JSArray_methods.removeAt$1(newFrames, 0);
-        }
+        newFrames = H.setRuntimeTypeInfo(new H.MappedListIterable(newFrames, new R.Trace_foldFrames_closure0(t1)), [null, null]).toList$0(0);
+        if (newFrames.length > 1 && C.JSArray_methods.get$first(newFrames).get$isCore())
+          C.JSArray_methods.removeAt$1(newFrames, 0);
         return new R.Trace(H.setRuntimeTypeInfo(new P.UnmodifiableListView(H.setRuntimeTypeInfo(new H.ReversedListIterable(newFrames), [H.getTypeArgumentByIndex(newFrames, 0)]).toList$0(0)), [S.Frame]));
       },
       toString$0: function(_) {
         var t1 = this.frames;
         return t1.map$1(t1, new R.Trace_toString_closure(t1.map$1(t1, new R.Trace_toString_closure0()).fold$2(0, 0, P.math__max$closure()))).join$0(0);
       },
+      $isStackTrace: 1,
       static: {Trace_Trace$from: function(trace) {
+          var t1;
           if (trace == null)
             throw H.wrapException(P.ArgumentError$("Cannot create a Trace from null."));
-          if (!!J.getInterceptor(trace).$isTrace)
+          t1 = J.getInterceptor(trace);
+          if (!!t1.$isTrace)
             return trace;
-          return new S.LazyTrace(new R.Trace_Trace$from_closure(trace), null);
+          if (!!t1.$isChain)
+            return trace.toTrace$0();
+          return new S.LazyTrace(new R.closure(trace), null);
         }, Trace_Trace$parse: function(trace) {
           var error, t1, exception;
           try {
             if (J.get$isEmpty$asx(trace) === true) {
               t1 = H.setRuntimeTypeInfo(new P.UnmodifiableListView(C.JSArray_methods.toList$0(H.setRuntimeTypeInfo([], [S.Frame]))), [S.Frame]);
               return new R.Trace(t1);
             }
             if (J.contains$1$asx(trace, $.$get$_v8Trace()) === true) {
               t1 = R.Trace$parseV8(trace);
               return t1;
             }
-            if (J.startsWith$1$s(trace, "\tat ")) {
+            if (J.contains$1$asx(trace, "\tat ") === true) {
               t1 = R.Trace$parseJSCore(trace);
               return t1;
             }
             if (J.contains$1$asx(trace, $.$get$_firefoxSafariTrace()) === true) {
               t1 = R.Trace$parseFirefox(trace);
               return t1;
             }
+            if (J.contains$1$asx(trace, "===== asynchronous gap ===========================\n") === true) {
+              t1 = O.Chain_Chain$parse(trace).toTrace$0();
+              return t1;
+            }
             if (J.contains$1$asx(trace, $.$get$_friendlyTrace()) === true) {
               t1 = R.Trace$parseFriendly(trace);
               return t1;
             }
             t1 = H.setRuntimeTypeInfo(new P.UnmodifiableListView(C.JSArray_methods.toList$0(R.Trace__parseVM(trace))), [S.Frame]);
             return new R.Trace(t1);
           } catch (exception) {
             t1 = H.unwrapException(exception);
             if (t1 instanceof P.FormatException) {
               error = t1;
@@ skipping 26 matching lines @@
           if (t1.get$isEmpty(trace) === true)
             t1 = [];
           else {
             t1 = t1.trim$0(trace).split("\n");
             t1 = H.setRuntimeTypeInfo(new H.WhereIterable(t1, new R.Trace$parseFriendly_closure()), [H.getTypeArgumentByIndex(t1, 0)]);
             t1 = H.MappedIterable_MappedIterable(t1, new R.Trace$parseFriendly_closure0(), H.getRuntimeTypeArgument(t1, "Iterable", 0), null);
           }
           return new R.Trace(H.setRuntimeTypeInfo(new P.UnmodifiableListView(J.toList$0$ax(t1)), [S.Frame]));
         }}
     },
-    Trace_Trace$from_closure: {
-      "^": "Closure:1;_captured_trace_0",
+    closure: {
+      "^": "Closure:1;trace",
       call$0: function() {
-        return R.Trace_Trace$parse(J.toString$0$(this._captured_trace_0));
+        return R.Trace_Trace$parse(J.toString$0$(this.trace));
       }
     },
     Trace__parseVM_closure: {
       "^": "Closure:0;",
       call$1: [function(line) {
         return S.Frame_Frame$parseVM(line);
       }, null, null, 2, 0, null, 10, "call"]
     },
     Trace$parseV8_closure: {
       "^": "Closure:0;",
@@ skipping 22 matching lines @@
     Trace$parseFirefox_closure: {
       "^": "Closure:0;",
       call$1: function(line) {
         var t1 = J.getInterceptor$asx(line);
         return t1.get$isNotEmpty(line) && !t1.$eq(line, "[native code]");
       }
     },
     Trace$parseFirefox_closure0: {
       "^": "Closure:0;",
       call$1: [function(line) {
-        var match, t1, uri, t2, t3, member, column;
-        match = $.$get$_firefoxSafariFrame().firstMatch$1(line);
-        if (match == null)
-          H.throwExpression(new P.FormatException("Couldn't parse Firefox/Safari stack trace line '" + H.S(line) + "'.", null, null));
-        t1 = match._match;
-        if (3 >= t1.length)
-          return H.ioore(t1, 3);
-        uri = S.Frame__uriOrPathToUri(t1[3]);
-        t2 = t1.length;
-        if (1 >= t2)
-          return H.ioore(t1, 1);
-        t3 = t1[1];
-        if (t3 != null) {
-          if (2 >= t2)
-            return H.ioore(t1, 2);
-          member = J.$add$ns(t3, C.JSArray_methods.join$0(P.List_List$filled(C.JSString_methods.allMatches$1("/", t1[2]).length, ".<fn>", null)));
-          if (J.$eq$(member, ""))
-            member = "<fn>";
-          member = J.replaceFirst$2$s(member, $.$get$_initialDot(), "");
-        } else
-          member = "<fn>";
-        if (4 >= t1.length)
-          return H.ioore(t1, 4);
-        if (J.$eq$(t1[4], ""))
-          line = null;
-        else {
-          if (4 >= t1.length)
-            return H.ioore(t1, 4);
-          line = H.Primitives_parseInt(t1[4], null, null);
-        }
-        if (5 >= t1.length)
-          return H.ioore(t1, 5);
-        t2 = t1[5];
-        if (t2 == null || J.$eq$(t2, ""))
-          column = null;
-        else {
-          if (5 >= t1.length)
-            return H.ioore(t1, 5);
-          column = H.Primitives_parseInt(t1[5], null, null);
-        }
-        return new S.Frame(uri, line, column, member);
+        return S.Frame_Frame$parseFirefox(line);
       }, null, null, 2, 0, null, 10, "call"]
     },
     Trace$parseFriendly_closure: {
       "^": "Closure:0;",
       call$1: function(line) {
         return !J.startsWith$1$s(line, "=====");
       }
     },
     Trace$parseFriendly_closure0: {
       "^": "Closure:0;",
       call$1: [function(line) {
-        var match, t1, uri, t2, t3, t4, column;
-        match = $.$get$_friendlyFrame().firstMatch$1(line);
-        if (match == null)
-          H.throwExpression(new P.FormatException("Couldn't parse package:stack_trace stack trace line '" + H.S(line) + "'.", null, null));
-        t1 = match._match;
-        if (1 >= t1.length)
-          return H.ioore(t1, 1);
-        uri = P.Uri_parse(t1[1], 0, null);
-        if (uri.scheme === "") {
-          t2 = $.$get$context0();
-          t3 = t2.fromUri$1(uri);
-          t4 = t2._context$_current;
-          uri = t2.toUri$1(t2.join$8(0, t4 != null ? t4 : B.current(), t3, null, null, null, null, null, null));
-        }
-        if (2 >= t1.length)
-          return H.ioore(t1, 2);
-        t2 = t1[2];
-        line = t2 == null ? null : H.Primitives_parseInt(t2, null, null);
-        if (3 >= t1.length)
-          return H.ioore(t1, 3);
-        t2 = t1[3];
-        column = t2 == null ? null : H.Primitives_parseInt(t2, null, null);
-        if (4 >= t1.length)
-          return H.ioore(t1, 4);
-        return new S.Frame(uri, line, column, t1[4]);
+        return S.Frame_Frame$parseFriendly(line);
       }, null, null, 2, 0, null, 10, "call"]
     },
     Trace_terse_closure: {
       "^": "Closure:0;",
       call$1: function(_) {
         return false;
       }
     },
     Trace_foldFrames_closure: {
-      "^": "Closure:0;_captured_oldPredicate_1",
+      "^": "Closure:0;oldPredicate",
       call$1: function(frame) {
-        if (this._captured_oldPredicate_1.call$1(frame) === true)
+        if (this.oldPredicate.call$1(frame) === true)
           return true;
         if (frame.get$isCore())
           return true;
         if (J.$eq$(frame.get$$package(), "stack_trace"))
           return true;
         if (J.contains$1$asx(frame.get$member(), "<async>") !== true)
           return false;
         return frame.get$line() == null;
       }
     },
     Trace_foldFrames_closure0: {
-      "^": "Closure:0;_trace$_box_0",
+      "^": "Closure:0;_box_0",
       call$1: [function(frame) {
         var t1, t2;
-        if (this._trace$_box_0._captured_predicate_0.call$1(frame) !== true)
+        if (frame instanceof N.UnparsedFrame || this._box_0.predicate.call$1(frame) !== true)
           return frame;
         t1 = frame.get$library();
         t2 = $.$get$_terseRegExp();
         H.checkString("");
         return new S.Frame(P.Uri_parse(H.stringReplaceAllUnchecked(t1, t2, ""), 0, null), null, null, frame.get$member());
-      }, null, null, 2, 0, null, 15, "call"]
+      }, null, null, 2, 0, null, 12, "call"]
     },
     Trace_toString_closure0: {
       "^": "Closure:0;",
       call$1: [function(frame) {
         return J.get$length$asx(J.get$location$x(frame));
-      }, null, null, 2, 0, null, 15, "call"]
+      }, null, null, 2, 0, null, 12, "call"]
     },
     Trace_toString_closure: {
-      "^": "Closure:0;_captured_longest_0",
+      "^": "Closure:0;longest",
       call$1: [function(frame) {
-        return H.S(N.padRight(J.get$location$x(frame), this._captured_longest_0)) + "  " + H.S(frame.get$member()) + "\n";
-      }, null, null, 2, 0, null, 15, "call"]
+        var t1 = J.getInterceptor(frame);
+        if (!!t1.$isUnparsedFrame)
+          return H.S(frame) + "\n";
+        return H.S(N.padRight(t1.get$location(frame), this.longest)) + "  " + H.S(frame.get$member()) + "\n";
+      }, null, null, 2, 0, null, 12, "call"]
     }
   }]];
   setupProgram(dart, 0);
   // getInterceptor methods
   J.getInterceptor = function(receiver) {
     if (typeof receiver == "number") {
       if (Math.floor(receiver) == receiver)
         return J.JSInt.prototype;
       return J.JSDouble.prototype;
     }
     if (typeof receiver == "string")
       return J.JSString.prototype;
     if (receiver == null)
       return J.JSNull.prototype;
     if (typeof receiver == "boolean")
       return J.JSBool.prototype;
     if (receiver.constructor == Array)
       return J.JSArray.prototype;
-    if (typeof receiver != "object")
+    if (typeof receiver != "object") {
+      if (typeof receiver == "function")
+        return J.JavaScriptFunction.prototype;
       return receiver;
+    }
     if (receiver instanceof P.Object)
       return receiver;
     return J.getNativeInterceptor(receiver);
   };
   J.getInterceptor$asx = function(receiver) {
     if (typeof receiver == "string")
       return J.JSString.prototype;
     if (receiver == null)
       return receiver;
     if (receiver.constructor == Array)
       return J.JSArray.prototype;
-    if (typeof receiver != "object")
+    if (typeof receiver != "object") {
+      if (typeof receiver == "function")
+        return J.JavaScriptFunction.prototype;
       return receiver;
+    }
     if (receiver instanceof P.Object)
       return receiver;
     return J.getNativeInterceptor(receiver);
   };
   J.getInterceptor$ax = function(receiver) {
     if (receiver == null)
       return receiver;
     if (receiver.constructor == Array)
       return J.JSArray.prototype;
-    if (typeof receiver != "object")
+    if (typeof receiver != "object") {
+      if (typeof receiver == "function")
+        return J.JavaScriptFunction.prototype;
       return receiver;
+    }
     if (receiver instanceof P.Object)
       return receiver;
     return J.getNativeInterceptor(receiver);
   };
   J.getInterceptor$n = function(receiver) {
     if (typeof receiver == "number")
       return J.JSNumber.prototype;
     if (receiver == null)
       return receiver;
     if (!(receiver instanceof P.Object))
@@ skipping 16 matching lines @@
       return J.JSString.prototype;
     if (receiver == null)
       return receiver;
     if (!(receiver instanceof P.Object))
       return J.UnknownJavaScriptObject.prototype;
     return receiver;
   };
   J.getInterceptor$x = function(receiver) {
     if (receiver == null)
       return receiver;
-    if (typeof receiver != "object")
+    if (typeof receiver != "object") {
+      if (typeof receiver == "function")
+        return J.JavaScriptFunction.prototype;
       return receiver;
+    }
     if (receiver instanceof P.Object)
       return receiver;
     return J.getNativeInterceptor(receiver);
   };
   J.set$src$x = function(receiver, value) {
     return J.getInterceptor$x(receiver).set$src(receiver, value);
   };
   J.get$contentWindow$x = function(receiver) {
     return J.getInterceptor$x(receiver).get$contentWindow(receiver);
   };
@@ skipping 32 matching lines @@
   };
   J.get$print$x = function(receiver) {
     return J.getInterceptor$x(receiver).get$print(receiver);
   };
   J.get$result$x = function(receiver) {
     return J.getInterceptor$x(receiver).get$result(receiver);
   };
   J.get$src$x = function(receiver) {
     return J.getInterceptor$x(receiver).get$src(receiver);
   };
-  J.get$start$x = function(receiver) {
-    return J.getInterceptor$x(receiver).get$start(receiver);
-  };
   J.$add$ns = function(receiver, a0) {
     if (typeof receiver == "number" && typeof a0 == "number")
       return receiver + a0;
     return J.getInterceptor$ns(receiver).$add(receiver, a0);
   };
   J.$and$n = function(receiver, a0) {
     if (typeof receiver == "number" && typeof a0 == "number")
       return (receiver & a0) >>> 0;
     return J.getInterceptor$n(receiver).$and(receiver, a0);
   };
@@ skipping 43 matching lines @@
   };
   J._addEventListener$3$x = function(receiver, a0, a1, a2) {
     return J.getInterceptor$x(receiver)._addEventListener$3(receiver, a0, a1, a2);
   };
   J._removeEventListener$3$x = function(receiver, a0, a1, a2) {
     return J.getInterceptor$x(receiver)._removeEventListener$3(receiver, a0, a1, a2);
   };
   J.add$1$ax = function(receiver, a0) {
     return J.getInterceptor$ax(receiver).add$1(receiver, a0);
   };
-  J.close$0$x = function(receiver) {
-    return J.getInterceptor$x(receiver).close$0(receiver);
+  J.clear$0$ax = function(receiver) {
+    return J.getInterceptor$ax(receiver).clear$0(receiver);
   };
   J.codeUnitAt$1$s = function(receiver, a0) {
     return J.getInterceptor$s(receiver).codeUnitAt$1(receiver, a0);
   };
   J.complete$1$x = function(receiver, a0) {
     return J.getInterceptor$x(receiver).complete$1(receiver, a0);
   };
   J.contains$1$asx = function(receiver, a0) {
     return J.getInterceptor$asx(receiver).contains$1(receiver, a0);
   };
@@ skipping 23 matching lines @@
   };
   J.replaceAll$2$s = function(receiver, a0, a1) {
     return J.getInterceptor$s(receiver).replaceAll$2(receiver, a0, a1);
   };
   J.replaceFirst$2$s = function(receiver, a0, a1) {
     return J.getInterceptor$s(receiver).replaceFirst$2(receiver, a0, a1);
   };
   J.send$1$x = function(receiver, a0) {
     return J.getInterceptor$x(receiver).send$1(receiver, a0);
   };
-  J.skip$1$ax = function(receiver, a0) {
-    return J.getInterceptor$ax(receiver).skip$1(receiver, a0);
-  };
   J.split$1$s = function(receiver, a0) {
     return J.getInterceptor$s(receiver).split$1(receiver, a0);
   };
   J.startsWith$1$s = function(receiver, a0) {
     return J.getInterceptor$s(receiver).startsWith$1(receiver, a0);
   };
   J.substring$1$s = function(receiver, a0) {
     return J.getInterceptor$s(receiver).substring$1(receiver, a0);
   };
   J.substring$2$s = function(receiver, a0, a1) {
@@ skipping 26 matching lines @@
   };
   J.toString$0$ = function(receiver) {
     return J.getInterceptor(receiver).toString$0(receiver);
   };
   Isolate.makeConstantList = function(list) {
     list.immutable$list = Array;
     list.fixed$length = Array;
     return list;
   };
   var $ = Isolate.$isolateProperties;
+  C.Interceptor_methods = J.Interceptor.prototype;
   C.JSArray_methods = J.JSArray.prototype;
-  C.JSDouble_methods = J.JSDouble.prototype;
   C.JSInt_methods = J.JSInt.prototype;
   C.JSNull_methods = J.JSNull.prototype;
   C.JSNumber_methods = J.JSNumber.prototype;
   C.JSString_methods = J.JSString.prototype;
+  C.JavaScriptFunction_methods = J.JavaScriptFunction.prototype;
   C.Location_methods = W.Location.prototype;
   C.NativeUint8List_methods = H.NativeUint8List.prototype;
   C.PlainJavaScriptObject_methods = J.PlainJavaScriptObject.prototype;
   C.UnknownJavaScriptObject_methods = J.UnknownJavaScriptObject.prototype;
   C.C_DynamicRuntimeType = new H.DynamicRuntimeType();
   C.C_OutOfMemoryError = new P.OutOfMemoryError();
+  C.C_Utf8Encoder = new P.Utf8Encoder();
   C.C__DelayedDone = new P._DelayedDone();
   C.C__RootZone = new P._RootZone();
   C.Duration_0 = new P.Duration(0);
   C.JS_CONST_0 = function(hooks) {
   if (typeof dartExperimentalFixupGetTag != "function") return hooks;
   hooks.getTag = dartExperimentalFixupGetTag(hooks.getTag);
 };
   C.JS_CONST_4hp = function(hooks) {
   var userAgent = typeof navigator == "object" ? navigator.userAgent : "";
   if (userAgent.indexOf("Firefox") == -1) return hooks;
@@ skipping 170 matching lines @@
   $.interceptorsForUncacheableTags = null;
   $.initNativeDispatchFlag = null;
   $.printToZone = null;
   $._nextCallback = null;
   $._lastCallback = null;
   $._lastPriorityCallback = null;
   $._isInCallbackLoop = false;
   $.Zone__current = C.C__RootZone;
   $._RootZone__rootDelegate = null;
   $.Expando__keyCount = 0;
+  $._currentUriBase = null;
+  $._current = null;
   $ = null;
   init.isHunkLoaded = function(hunkHash) {
     return !!$dart_deferred_initializers$[hunkHash];
   };
   init.deferredInitialized = new Object(null);
   init.isHunkInitialized = function(hunkHash) {
     return init.deferredInitialized[hunkHash];
   };
   init.initializeLoadedHunk = function(hunkHash) {
     $dart_deferred_initializers$[hunkHash]($globals$, $);
     init.deferredInitialized[hunkHash] = true;
   };
   init.deferredLibraryUris = {};
   init.deferredLibraryHashes = {};
   // Empty type-to-interceptor map.
   (function(lazies) {
     for (var i = 0; i < lazies.length;) {
       var fieldName = lazies[i++];
       var getterName = lazies[i++];
       var staticName = lazies[i++];
       var lazyValue = lazies[i++];
       Isolate.$lazy(fieldName, getterName, lazyValue, staticName);
     }
-  })(["IsolateNatives_thisScript", "$get$IsolateNatives_thisScript", "thisScript", function() {
+  })(["DART_CLOSURE_PROPERTY_NAME", "$get$DART_CLOSURE_PROPERTY_NAME", "DART_CLOSURE_PROPERTY_NAME", function() {
+    return H.getIsolateAffinityTag("_$dart_dartClosure");
+  }, "IsolateNatives_thisScript", "$get$IsolateNatives_thisScript", "thisScript", function() {
     return H.IsolateNatives_computeThisScript();
   }, "IsolateNatives_workerIds", "$get$IsolateNatives_workerIds", "workerIds", function() {
     return new P.Expando(null);
   }, "TypeErrorDecoder_noSuchMethodPattern", "$get$TypeErrorDecoder_noSuchMethodPattern", "noSuchMethodPattern", function() {
     return H.TypeErrorDecoder_extractPattern(H.TypeErrorDecoder_provokeCallErrorOn({toString: function() {
         return "$receiver$";
       }}));
   }, "TypeErrorDecoder_notClosurePattern", "$get$TypeErrorDecoder_notClosurePattern", "notClosurePattern", function() {
     return H.TypeErrorDecoder_extractPattern(H.TypeErrorDecoder_provokeCallErrorOn({$method$: null, toString: function() {
         return "$receiver$";
@@ skipping 33 matching lines @@
   }, "TypeErrorDecoder_undefinedPropertyPattern", "$get$TypeErrorDecoder_undefinedPropertyPattern", "undefinedPropertyPattern", function() {
     return H.TypeErrorDecoder_extractPattern(H.TypeErrorDecoder_provokePropertyErrorOn(void 0));
   }, "TypeErrorDecoder_undefinedLiteralPropertyPattern", "$get$TypeErrorDecoder_undefinedLiteralPropertyPattern", "undefinedLiteralPropertyPattern", function() {
     return H.TypeErrorDecoder_extractPattern(function() {
       try {
         (void 0).$method$;
       } catch (e) {
         return e.message;
       }
     }());
-  }, "_AsyncRun_scheduleImmediateClosure", "$get$_AsyncRun_scheduleImmediateClosure", "scheduleImmediateClosure", function() {
+  }, "_AsyncRun__scheduleImmediateClosure", "$get$_AsyncRun__scheduleImmediateClosure", "_scheduleImmediateClosure", function() {
     return P._AsyncRun__initializeScheduleImmediate();
   }, "Future__nullFuture", "$get$Future__nullFuture", "_nullFuture", function() {
     return P.Future_Future$value(null, null);
   }, "_RootZone__rootMap", "$get$_RootZone__rootMap", "_rootMap", function() {
     return P.HashMap_HashMap(null, null, null, null, null);
   }, "_toStringVisiting", "$get$_toStringVisiting", "_toStringVisiting", function() {
     return [];
+  }, "Uri__needsNoEncoding", "$get$Uri__needsNoEncoding", "_needsNoEncoding", function() {
+    return P.RegExp_RegExp("^[\\-\\.0-9A-Z_a-z~]*$", true, false);
   }, "context", "$get$context", "context", function() {
     return P._wrapToDart(self);
   }, "_DART_OBJECT_PROPERTY_NAME", "$get$_DART_OBJECT_PROPERTY_NAME", "_DART_OBJECT_PROPERTY_NAME", function() {
     return H.getIsolateAffinityTag("_$dart_dartObject");
-  }, "_DART_CLOSURE_PROPERTY_NAME", "$get$_DART_CLOSURE_PROPERTY_NAME", "_DART_CLOSURE_PROPERTY_NAME", function() {
-    return H.getIsolateAffinityTag("_$dart_dartClosure");
   }, "_dartProxyCtor", "$get$_dartProxyCtor", "_dartProxyCtor", function() {
     return function DartObject(o) {
       this.o = o;
     };
   }, "_vmFrame", "$get$_vmFrame", "_vmFrame", function() {
     return P.RegExp_RegExp("^#\\d+\\s+(\\S.*) \\((.+?)((?::\\d+){0,2})\\)$", true, false);
   }, "_v8Frame", "$get$_v8Frame", "_v8Frame", function() {
     return P.RegExp_RegExp("^\\s*at (?:(\\S.*?)(?: \\[as [^\\]]+\\])? \\((.*)\\)|(.*))$", true, false);
   }, "_v8UrlLocation", "$get$_v8UrlLocation", "_v8UrlLocation", function() {
-    return P.RegExp_RegExp("^(.*):(\\d+):(\\d+)$", true, false);
+    return P.RegExp_RegExp("^(.*):(\\d+):(\\d+)|native$", true, false);
   }, "_v8EvalLocation", "$get$_v8EvalLocation", "_v8EvalLocation", function() {
     return P.RegExp_RegExp("^eval at (?:\\S.*?) \\((.*)\\)(?:, .*?:\\d+:\\d+)?$", true, false);
   }, "_firefoxSafariFrame", "$get$_firefoxSafariFrame", "_firefoxSafariFrame", function() {
     return P.RegExp_RegExp("^(?:([^@(/]*)(?:\\(.*\\))?((?:/[^/]*)*)(?:\\(.*\\))?@)?(.*?):(\\d*)(?::(\\d*))?$", true, false);
   }, "_friendlyFrame", "$get$_friendlyFrame", "_friendlyFrame", function() {
     return P.RegExp_RegExp("^(\\S+)(?: (\\d+)(?::(\\d+))?)?\\s+([^\\d]\\S*)$", true, false);
   }, "_asyncBody", "$get$_asyncBody", "_asyncBody", function() {
     return P.RegExp_RegExp("<(<anonymous closure>|[^>]+)_async_body>", true, false);
   }, "_initialDot", "$get$_initialDot", "_initialDot", function() {
     return P.RegExp_RegExp("^\\.", true, false);
   }, "Frame__uriRegExp", "$get$Frame__uriRegExp", "_uriRegExp", function() {
     return P.RegExp_RegExp("^[a-zA-Z][-+.a-zA-Z\\d]*://", true, false);
   }, "Frame__windowsRegExp", "$get$Frame__windowsRegExp", "_windowsRegExp", function() {
     return P.RegExp_RegExp("^([a-zA-Z]:[\\\\/]|\\\\\\\\)", true, false);
+  }, "_iframes", "$get$_iframes", "_iframes", function() {
+    return H.JsLinkedHashMap_JsLinkedHashMap$es6(P.$int, W.IFrameElement);
   }, "windows", "$get$windows", "windows", function() {
     return F.Context_Context(null, $.$get$Style_windows());
   }, "context0", "$get$context0", "context", function() {
     return new F.Context($.$get$Style_platform(), null);
   }, "Style_posix", "$get$Style_posix", "posix", function() {
     return new Z.PosixStyle("posix", "/", C.List_cSk, P.RegExp_RegExp("/", true, false), P.RegExp_RegExp("[^/]$", true, false), P.RegExp_RegExp("^/", true, false), null);
   }, "Style_windows", "$get$Style_windows", "windows", function() {
     return new T.WindowsStyle("windows", "\\", C.List_WnV, P.RegExp_RegExp("[/\\\\]", true, false), P.RegExp_RegExp("[^/\\\\]$", true, false), P.RegExp_RegExp("^(\\\\\\\\[^\\\\]+\\\\[^\\\\/]+|[a-zA-Z]:[/\\\\])", true, false), P.RegExp_RegExp("^[/\\\\](?![/\\\\])", true, false));
   }, "Style_url", "$get$Style_url", "url", function() {
     return new E.UrlStyle("url", "/", C.List_cSk, P.RegExp_RegExp("/", true, false), P.RegExp_RegExp("(^[a-zA-Z][-+.a-zA-Z\\d]*://|[^/])$", true, false), P.RegExp_RegExp("[a-zA-Z][-+.a-zA-Z\\d]*://[^/]*", true, false), P.RegExp_RegExp("^/", true, false));
   }, "Style_platform", "$get$Style_platform", "platform", function() {
     return S.Style__getPlatformStyle();
-  }, "_iframes", "$get$_iframes", "_iframes", function() {
-    return P.LinkedHashMap_LinkedHashMap(null, null, null, P.$int, W.IFrameElement);
   }, "_terseRegExp", "$get$_terseRegExp", "_terseRegExp", function() {
-    return P.RegExp_RegExp("(-patch)?(/.*)?$", true, false);
+    return P.RegExp_RegExp("(-patch)?([/\\\\].*)?$", true, false);
   }, "_v8Trace", "$get$_v8Trace", "_v8Trace", function() {
     return P.RegExp_RegExp("\\n    ?at ", true, false);
   }, "_v8TraceLine", "$get$_v8TraceLine", "_v8TraceLine", function() {
     return P.RegExp_RegExp("    ?at ", true, false);
   }, "_firefoxSafariTrace", "$get$_firefoxSafariTrace", "_firefoxSafariTrace", function() {
     return P.RegExp_RegExp("^(([.0-9A-Za-z_$/<]|\\(.*\\))*@)?[^\\s]*:\\d*$", true, true);
   }, "_friendlyTrace", "$get$_friendlyTrace", "_friendlyTrace", function() {
     return P.RegExp_RegExp("^[^\\s]+( \\d+(:\\d+)?)?[ \\t]+[^\\s]+$", true, true);
   }]);
   Isolate = Isolate.$finishIsolateConstructor(Isolate);
   $ = new Isolate();
-  init.metadata = ["self", "parent", "zone", "error", "stackTrace", null, "message", "f", "value", "arg", "line", "_", "data", "key", "callback", "frame", "invocation", "x", "arg2", "duration", "object", "element", "arg1", "e", "s", "o", "closure", "isolate", "arg4", "sender", "zoneValues", "arg3", "each", "ignored", "k", "v", 0, "result", "encodedComponent", "byteString", "captureThis", "arguments", "specification", "numberOfArguments"];
-  init.types = [{func: 1, args: [,]}, {func: 1}, {func: 1, void: true}, {func: 1, args: [,,]}, {func: 1, args: [, P.StackTrace]}, {func: 1, void: true, args: [{func: 1, void: true}]}, {func: 1, void: true, args: [P.String]}, {func: 1, ret: P.String, args: [P.$int]}, {func: 1, void: true, args: [,], opt: [P.StackTrace]}, {func: 1, args: [,], opt: [,]}, {func: 1, ret: {func: 1, args: [,,]}, args: [{func: 1, args: [,,]}]}, {func: 1, void: true, args: [P.Object], opt: [P.StackTrace]}, {func: 1, args: [P.$int,,]}, {func: 1, ret: P.Object, args: [,]}, {func: 1, args: [P.$int]}, {func: 1, ret: P.$int, args: [,]}, {func: 1, ret: P.Timer, args: [P.Duration, {func: 1, void: true, args: [P.Timer]}]}, {func: 1, ret: P.Timer, args: [P.Duration, {func: 1, void: true}]}, {func: 1, void: true, args: [, P.StackTrace]}, {func: 1, ret: P.AsyncError, args: [P.Object, P.StackTrace]}, {func: 1, ret: {func: 1, args: [,]}, args: [{func: 1, args: [,]}]}, {func: 1, ret: {func: 1}, args: [{func: 1}]}, {func: 1, args: [{func: 1, args: [,,]},,,]}, {func: 1, args: [{func: 1, args: [,]},,]}, {func: 1, args: [{func: 1}]}, {func: 1, ret: P.Zone, named: {specification: P.ZoneSpecification, zoneValues: P.Map}}, {func: 1, void: true, args: [P.Zone, P.String]}, {func: 1, ret: P.Zone, args: [P.Zone, P.ZoneSpecification, P.Map]}, {func: 1, ret: P.Timer, args: [P.Zone, P.Duration, {func: 1, void: true, args: [P.Timer]}]}, {func: 1, ret: P.Timer, args: [P.Zone, P.Duration, {func: 1, void: true}]}, {func: 1, args: [P.String,,]}, {func: 1, ret: P.AsyncError, args: [P.Zone, P.Object, P.StackTrace]}, {func: 1, ret: {func: 1, args: [,,]}, args: [P.Zone, {func: 1, args: [,,]}]}, {func: 1, ret: {func: 1, args: [,]}, args: [P.Zone, {func: 1, args: [,]}]}, {func: 1, void: true, args: [P.Zone, {func: 1}]}, {func: 1, ret: {func: 1}, args: [P.Zone, {func: 1}]}, {func: 1, args: [P.Zone, {func: 1, args: [,,]},,,]}, {func: 1, args: [P.Zone, {func: 1, args: [,]},,]}, {func: 1, args: [P.Zone, {func: 1}]}, {func: 1, args: [, P.String]}, {func: 1, args: [P.Zone, P.ZoneDelegate, P.Zone,, P.StackTrace]}, {func: 1, args: [P.String]}, {func: 1, ret: P.$int, args: [, P.$int]}, {func: 1, void: true, args: [P.$int, P.$int]}, {func: 1, args: [P.Symbol,,]}, {func: 1, ret: P.num, args: [P.num, P.num]}, {func: 1, ret: P.$int, args: [,,]}, {func: 1, void: true, args: [P.String], opt: [,]}, {func: 1, ret: P.$int, args: [P.$int, P.$int]}, {func: 1, args: [P.Zone,, P.StackTrace]}, {func: 1, void: true, args: [P.Object, P.StackTrace]}, {func: 1, args: [P.bool]}, {func: 1, ret: P.Future, args: [,]}, {func: 1, void: true, args: [P.Zone, P.ZoneDelegate, P.Zone,, P.StackTrace]}, {func: 1, args: [P.Zone, P.ZoneDelegate, P.Zone, {func: 1}]}, {func: 1, args: [P.Zone, P.ZoneDelegate, P.Zone, {func: 1, args: [,]},,]}, {func: 1, args: [P.Zone, P.ZoneDelegate, P.Zone, {func: 1, args: [,,]},,,]}, {func: 1, ret: {func: 1}, args: [P.Zone, P.ZoneDelegate, P.Zone, {func: 1}]}, {func: 1, ret: {func: 1, args: [,]}, args: [P.Zone, P.ZoneDelegate, P.Zone, {func: 1, args: [,]}]}, {func: 1, ret: {func: 1, args: [,,]}, args: [P.Zone, P.ZoneDelegate, P.Zone, {func: 1, args: [,,]}]}, {func: 1, ret: P.AsyncError, args: [P.Zone, P.ZoneDelegate, P.Zone, P.Object, P.StackTrace]}, {func: 1, void: true, args: [P.Zone, P.ZoneDelegate, P.Zone, {func: 1}]}, {func: 1, ret: P.Timer, args: [P.Zone, P.ZoneDelegate, P.Zone, P.Duration, {func: 1, void: true}]}, {func: 1, ret: P.Timer, args: [P.Zone, P.ZoneDelegate, P.Zone, P.Duration, {func: 1, void: true, args: [P.Timer]}]}, {func: 1, void: true, args: [P.Zone, P.ZoneDelegate, P.Zone, P.String]}, {func: 1, ret: P.Zone, args: [P.Zone, P.ZoneDelegate, P.Zone, P.ZoneSpecification, P.Map]}, {func: 1, args: [{func: 1, void: true}]}, {func: 1, ret: P.String, args: [P.String]}, {func: 1, ret: P.bool}];
+  init.metadata = ["self", "error", "stackTrace", "parent", "zone", null, "value", "message", "f", "_", "line", "trace", "frame", "arg", "result", "data", "callback", "key", "duration", "object", "arg1", "arg2", "each", "element", "invocation", "x", "o", "numberOfArguments", "arg3", "arg4", "specification", "zoneValues", "sender", "e", "ignored", "k", "v", 0, "encodedComponent", "s", "byteString", "captureThis", "arguments", "closure", "isolate", "errorCode"];
+  init.types = [{func: 1, args: [,]}, {func: 1}, {func: 1, v: true}, {func: 1, args: [,,]}, {func: 1, v: true, args: [{func: 1, v: true}]}, {func: 1, args: [, P.StackTrace]}, {func: 1, v: true, args: [,], opt: [P.StackTrace]}, {func: 1, v: true, args: [P.String]}, {func: 1, ret: {func: 1}, args: [{func: 1}]}, {func: 1, args: [,], opt: [,]}, {func: 1, v: true, args: [P.Object], opt: [P.StackTrace]}, {func: 1, v: true, args: [, P.StackTrace]}, {func: 1, ret: P.Object, args: [,]}, {func: 1, ret: P.Timer, args: [P.Duration, {func: 1, v: true, args: [P.Timer]}]}, {func: 1, ret: P.Timer, args: [P.Duration, {func: 1, v: true}]}, {func: 1, ret: P.String, args: [P.$int]}, {func: 1, ret: P.AsyncError, args: [P.Object, P.StackTrace]}, {func: 1, ret: {func: 1, args: [,,]}, args: [{func: 1, args: [,,]}]}, {func: 1, ret: {func: 1, args: [,]}, args: [{func: 1, args: [,]}]}, {func: 1, args: [{func: 1, args: [,,]},,,]}, {func: 1, args: [{func: 1, args: [,]},,]}, {func: 1, args: [{func: 1}]}, {func: 1, ret: P.Zone, named: {specification: P.ZoneSpecification, zoneValues: P.Map}}, {func: 1, ret: P.AsyncError, args: [P.Zone, P.Object, P.StackTrace]}, {func: 1, v: true, args: [P.Zone, {func: 1}]}, {func: 1, ret: P.Timer, args: [P.Zone, P.Duration, {func: 1, v: true}]}, {func: 1, ret: P.Timer, args: [P.Zone, P.Duration, {func: 1, v: true, args: [P.Timer]}]}, {func: 1, v: true, args: [P.Zone, P.String]}, {func: 1, ret: P.Zone, args: [P.Zone, P.ZoneSpecification, P.Map]}, {func: 1, args: [, P.String]}, {func: 1, ret: {func: 1, args: [,]}, args: [P.Zone, {func: 1, args: [,]}]}, {func: 1, ret: {func: 1}, args: [P.Zone, {func: 1}]}, {func: 1, args: [P.Zone, {func: 1, args: [,,]},,,]}, {func: 1, ret: {func: 1, args: [,,]}, args: [P.Zone, {func: 1, args: [,,]}]}, {func: 1, args: [P.Zone, {func: 1, args: [,]},,]}, {func: 1, args: [P.Zone, {func: 1}]}, {func: 1, args: [P.Zone,, P.StackTrace]}, {func: 1, args: [P.String]}, {func: 1, args: [P.bool]}, {func: 1, ret: P.bool}, {func: 1, args: [{func: 1, v: true}]}, {func: 1, args: [P.Zone, P.ZoneDelegate, P.Zone,, P.StackTrace]}, {func: 1, args: [P.String,,]}, {func: 1, ret: P.$int, args: [, P.$int]}, {func: 1, ret: P.num, args: [P.num, P.num]}, {func: 1, args: [P.Symbol,,]}, {func: 1, v: true, opt: [,]}, {func: 1, ret: P.$int, args: [,,]}, {func: 1, v: true, args: [P.String], opt: [,]}, {func: 1, ret: P.$int, args: [P.$int, P.$int]}, {func: 1, ret: P.Future, args: [,]}, {func: 1, v: true, args: [,]}, {func: 1, v: true, args: [P.Zone, P.ZoneDelegate, P.Zone,, P.StackTrace]}, {func: 1, args: [P.Zone, P.ZoneDelegate, P.Zone, {func: 1}]}, {func: 1, args: [P.Zone, P.ZoneDelegate, P.Zone, {func: 1, args: [,]},,]}, {func: 1, args: [P.Zone, P.ZoneDelegate, P.Zone, {func: 1, args: [,,]},,,]}, {func: 1, ret: {func: 1}, args: [P.Zone, P.ZoneDelegate, P.Zone, {func: 1}]}, {func: 1, ret: {func: 1, args: [,]}, args: [P.Zone, P.ZoneDelegate, P.Zone, {func: 1, args: [,]}]}, {func: 1, ret: {func: 1, args: [,,]}, args: [P.Zone, P.ZoneDelegate, P.Zone, {func: 1, args: [,,]}]}, {func: 1, ret: P.AsyncError, args: [P.Zone, P.ZoneDelegate, P.Zone, P.Object, P.StackTrace]}, {func: 1, v: true, args: [P.Zone, P.ZoneDelegate, P.Zone, {func: 1}]}, {func: 1, ret: P.Timer, args: [P.Zone, P.ZoneDelegate, P.Zone, P.Duration, {func: 1, v: true}]}, {func: 1, ret: P.Timer, args: [P.Zone, P.ZoneDelegate, P.Zone, P.Duration, {func: 1, v: true, args: [P.Timer]}]}, {func: 1, v: true, args: [P.Zone, P.ZoneDelegate, P.Zone, P.String]}, {func: 1, ret: P.Zone, args: [P.Zone, P.ZoneDelegate, P.Zone, P.ZoneSpecification, P.Map]}, {func: 1, args: [P.$int,,]}, {func: 1, ret: P.String, args: [P.String]}, {func: 1, v: true, args: [P.$int, P.$int]}];
   function convertToFastObject(properties) {
     function MyClass() {
     }
     MyClass.prototype = properties;
     new MyClass();
     return properties;
   }
   function convertToSlowObject(properties) {
     properties.__MAGIC_SLOW_PROPERTY = 1;
     delete properties.__MAGIC_SLOW_PROPERTY;
@@ skipping 86 matching lines @@
       }
       Isolate.prototype = oldIsolate.prototype;
       Isolate.prototype.constructor = Isolate;
       Isolate.$isolateProperties = isolateProperties;
       Isolate.makeConstantList = oldIsolate.makeConstantList;
       Isolate.functionThatReturnsNull = oldIsolate.functionThatReturnsNull;
       return Isolate;
     };
   }
   !function() {
-    function intern(s) {
+    var intern = function(s) {
       var o = {};
       o[s] = 1;
       return Object.keys(convertToFastObject(o))[0];
-    }
+    };
     init.getIsolateTag = function(name) {
       return intern("___dart_" + name + init.isolateTag);
     };
     var tableProperty = "___dart_isolate_tags_";
     var usedProperties = Object[tableProperty] || (Object[tableProperty] = Object.create(null));
     var rootProperty = "_ZxYxX";
     for (var i = 0;; i++) {
       var property = intern(rootProperty + "_" + i + "_");
       if (!(property in usedProperties)) {
         usedProperties[property] = 1;
@@ skipping 18 matching lines @@
       for (var i = 0; i < scripts.length; ++i)
         scripts[i].removeEventListener("load", onLoad, false);
       callback(event.target);
     }
     for (var i = 0; i < scripts.length; ++i)
       scripts[i].addEventListener("load", onLoad, false);
   })(function(currentScript) {
     init.currentScript = currentScript;
     if (typeof dartMainRunner === "function")
       dartMainRunner(function(a) {
-        H.startRootIsolate(R.host__main$closure(), a);
+        H.startRootIsolate(M.host__main$closure(), a);
       }, []);
     else
       (function(a) {
-        H.startRootIsolate(R.host__main$closure(), a);
+        H.startRootIsolate(M.host__main$closure(), a);
       })([]);
   });
   // END invoke [main].
 })();
 
 //# sourceMappingURL=host.dart.js.map