Fix dispatch on MemberSets to always go dynamic if needed.

frog/frogsh

Index: frog/frogsh
diff --git a/frog/frogsh b/frog/frogsh
index 92b6e5fcde24e6ce01dfff5fb5522b61dfcc1289..827f0fdba2d4b676225aec8e8b8b5a1b695d3fee 100755
--- a/frog/frogsh
+++ b/frog/frogsh
@@ -197,6 +197,9 @@ function AssertError(failedAssertion, url, line, column) {
 AssertError.prototype.toString = function() {
   return ("Failed assertion: '" + this.failedAssertion + "' is not true ") + ("in " + this.url + " at line " + this.line + ", column " + this.column + ".");
 }
+AssertError.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for Object **************
 Object.prototype.get$dynamic = function() {
   return this;
@@ -206,44 +209,457 @@ Object.prototype.noSuchMethod = function(name, args) {
 }
 Object.prototype._get$3 = function($0, $1, $2) {
   return this.noSuchMethod("_get", [$0, $1, $2]);
-}
-;
+};
 Object.prototype._set$4 = function($0, $1, $2, $3) {
   return this.noSuchMethod("_set", [$0, $1, $2, $3]);
-}
-;
+};
+Object.prototype.accept$1 = function($0) {
+  return this.noSuchMethod("accept", [$0]);
+};
+Object.prototype.add$1 = function($0) {
+  return this.noSuchMethod("add", [$0]);
+};
+Object.prototype.addAll$1 = function($0) {
+  return this.noSuchMethod("addAll", [$0]);
+};
+Object.prototype.addDirectSubtype$1 = function($0) {
+  return this.noSuchMethod("addDirectSubtype", [$0]);
+};
+Object.prototype.addMethod$2 = function($0, $1) {
+  return this.noSuchMethod("addMethod", [$0, $1]);
+};
+Object.prototype.addSource$1 = function($0) {
+  return this.noSuchMethod("addSource", [$0]);
+};
+Object.prototype.beginArguments$1 = function($0) {
+  return this.noSuchMethod("beginArguments", [$0]);
+};
+Object.prototype.beginBlock$1 = function($0) {
+  return this.noSuchMethod("beginBlock", [$0]);
+};
+Object.prototype.beginClass$1 = function($0) {
+  return this.noSuchMethod("beginClass", [$0]);
+};
+Object.prototype.beginExpressionStatement$1 = function($0) {
+  return this.noSuchMethod("beginExpressionStatement", [$0]);
+};
+Object.prototype.beginForStatement$1 = function($0) {
+  return this.noSuchMethod("beginForStatement", [$0]);
+};
+Object.prototype.beginFormalParameter$1 = function($0) {
+  return this.noSuchMethod("beginFormalParameter", [$0]);
+};
+Object.prototype.beginFormalParameters$1 = function($0) {
+  return this.noSuchMethod("beginFormalParameters", [$0]);
+};
+Object.prototype.beginFunction$1 = function($0) {
+  return this.noSuchMethod("beginFunction", [$0]);
+};
+Object.prototype.beginFunctionBody$1 = function($0) {
+  return this.noSuchMethod("beginFunctionBody", [$0]);
+};
+Object.prototype.beginFunctionName$1 = function($0) {
+  return this.noSuchMethod("beginFunctionName", [$0]);
+};
+Object.prototype.beginFunctionTypeAlias$1 = function($0) {
+  return this.noSuchMethod("beginFunctionTypeAlias", [$0]);
+};
+Object.prototype.beginIfStatement$1 = function($0) {
+  return this.noSuchMethod("beginIfStatement", [$0]);
+};
+Object.prototype.beginInitializedIdentifier$1 = function($0) {
+  return this.noSuchMethod("beginInitializedIdentifier", [$0]);
+};
+Object.prototype.beginInitializer$1 = function($0) {
+  return this.noSuchMethod("beginInitializer", [$0]);
+};
+Object.prototype.beginInterface$1 = function($0) {
+  return this.noSuchMethod("beginInterface", [$0]);
+};
+Object.prototype.beginLibraryTag$1 = function($0) {
+  return this.noSuchMethod("beginLibraryTag", [$0]);
+};
+Object.prototype.beginReturnStatement$1 = function($0) {
+  return this.noSuchMethod("beginReturnStatement", [$0]);
+};
+Object.prototype.beginSend$1 = function($0) {
+  return this.noSuchMethod("beginSend", [$0]);
+};
+Object.prototype.beginThrowStatement$1 = function($0) {
+  return this.noSuchMethod("beginThrowStatement", [$0]);
+};
+Object.prototype.beginTopLevelMember$1 = function($0) {
+  return this.noSuchMethod("beginTopLevelMember", [$0]);
+};
 Object.prototype.beginTypeArguments$1 = function($0) {
   return this.noSuchMethod("beginTypeArguments", [$0]);
-}
-;
+};
+Object.prototype.beginTypeVariable$1 = function($0) {
+  return this.noSuchMethod("beginTypeVariable", [$0]);
+};
 Object.prototype.beginTypeVariables$1 = function($0) {
   return this.noSuchMethod("beginTypeVariables", [$0]);
-}
-;
+};
+Object.prototype.beginVariablesDeclaration$1 = function($0) {
+  return this.noSuchMethod("beginVariablesDeclaration", [$0]);
+};
+Object.prototype.block$0 = function() {
+  return this.noSuchMethod("block", []);
+};
+Object.prototype.canInvoke$2 = function($0, $1) {
+  return this.noSuchMethod("canInvoke", [$0, $1]);
+};
+Object.prototype.charCodeAt$1 = function($0) {
+  return this.noSuchMethod("charCodeAt", [$0]);
+};
+Object.prototype.checkFirstClass$1 = function($0) {
+  return this.noSuchMethod("checkFirstClass", [$0]);
+};
+Object.prototype.compareTo$1 = function($0) {
+  return this.noSuchMethod("compareTo", [$0]);
+};
+Object.prototype.computeType$2 = function($0, $1) {
+  return this.noSuchMethod("computeType", [$0, $1]);
+};
+Object.prototype.computeValue$0 = function() {
+  return this.noSuchMethod("computeValue", []);
+};
+Object.prototype.contains$1 = function($0) {
+  return this.noSuchMethod("contains", [$0]);
+};
+Object.prototype.convertTo$3 = function($0, $1, $2) {
+  return this.noSuchMethod("convertTo", [$0, $1, $2]);
+};
+Object.prototype.convertTo$4 = function($0, $1, $2, $3) {
+  return this.noSuchMethod("convertTo", [$0, $1, $2, $3]);
+};
+Object.prototype.copyWithNewType$1 = function($0) {
+  return this.noSuchMethod("copyWithNewType", [$0]);
+};
+Object.prototype.endArguments$3 = function($0, $1, $2) {
+  return this.noSuchMethod("endArguments", [$0, $1, $2]);
+};
+Object.prototype.endBlock$3 = function($0, $1, $2) {
+  return this.noSuchMethod("endBlock", [$0, $1, $2]);
+};
+Object.prototype.endClass$5 = function($0, $1, $2, $3, $4) {
+  return this.noSuchMethod("endClass", [$0, $1, $2, $3, $4]);
+};
+Object.prototype.endExpressionStatement$1 = function($0) {
+  return this.noSuchMethod("endExpressionStatement", [$0]);
+};
+Object.prototype.endForStatement$2 = function($0, $1) {
+  return this.noSuchMethod("endForStatement", [$0, $1]);
+};
+Object.prototype.endFormalParameter$1 = function($0) {
+  return this.noSuchMethod("endFormalParameter", [$0]);
+};
+Object.prototype.endFormalParameters$3 = function($0, $1, $2) {
+  return this.noSuchMethod("endFormalParameters", [$0, $1, $2]);
+};
+Object.prototype.endFunctionBody$3 = function($0, $1, $2) {
+  return this.noSuchMethod("endFunctionBody", [$0, $1, $2]);
+};
+Object.prototype.endFunctionName$1 = function($0) {
+  return this.noSuchMethod("endFunctionName", [$0]);
+};
+Object.prototype.endFunctionTypeAlias$1 = function($0) {
+  return this.noSuchMethod("endFunctionTypeAlias", [$0]);
+};
+Object.prototype.endIfStatement$2 = function($0, $1) {
+  return this.noSuchMethod("endIfStatement", [$0, $1]);
+};
+Object.prototype.endInitializedIdentifier$0 = function() {
+  return this.noSuchMethod("endInitializedIdentifier", []);
+};
+Object.prototype.endInitializer$1 = function($0) {
+  return this.noSuchMethod("endInitializer", [$0]);
+};
+Object.prototype.endInterface$1 = function($0) {
+  return this.noSuchMethod("endInterface", [$0]);
+};
+Object.prototype.endRethrowStatement$2 = function($0, $1) {
+  return this.noSuchMethod("endRethrowStatement", [$0, $1]);
+};
+Object.prototype.endReturnStatement$3 = function($0, $1, $2) {
+  return this.noSuchMethod("endReturnStatement", [$0, $1, $2]);
+};
+Object.prototype.endSend$1 = function($0) {
+  return this.noSuchMethod("endSend", [$0]);
+};
+Object.prototype.endThrowStatement$2 = function($0, $1) {
+  return this.noSuchMethod("endThrowStatement", [$0, $1]);
+};
+Object.prototype.endTopLevelField$2 = function($0, $1) {
+  return this.noSuchMethod("endTopLevelField", [$0, $1]);
+};
+Object.prototype.endTopLevelMethod$2 = function($0, $1) {
+  return this.noSuchMethod("endTopLevelMethod", [$0, $1]);
+};
+Object.prototype.endType$1 = function($0) {
+  return this.noSuchMethod("endType", [$0]);
+};
 Object.prototype.endTypeArguments$3 = function($0, $1, $2) {
   return this.noSuchMethod("endTypeArguments", [$0, $1, $2]);
-}
-;
+};
+Object.prototype.endTypeVariable$1 = function($0) {
+  return this.noSuchMethod("endTypeVariable", [$0]);
+};
 Object.prototype.endTypeVariables$3 = function($0, $1, $2) {
   return this.noSuchMethod("endTypeVariables", [$0, $1, $2]);
-}
-;
+};
+Object.prototype.endVariablesDeclaration$2 = function($0, $1) {
+  return this.noSuchMethod("endVariablesDeclaration", [$0, $1]);
+};
+Object.prototype.endsWith$1 = function($0) {
+  return this.noSuchMethod("endsWith", [$0]);
+};
+Object.prototype.ensureSubtypeOf$3 = function($0, $1, $2) {
+  return this.noSuchMethod("ensureSubtypeOf", [$0, $1, $2]);
+};
+Object.prototype.expected$2 = function($0, $1) {
+  return this.noSuchMethod("expected", [$0, $1]);
+};
+Object.prototype.expectedBlock$1 = function($0) {
+  return this.noSuchMethod("expectedBlock", [$0]);
+};
+Object.prototype.expectedIdentifier$1 = function($0) {
+  return this.noSuchMethod("expectedIdentifier", [$0]);
+};
+Object.prototype.expectedType$1 = function($0) {
+  return this.noSuchMethod("expectedType", [$0]);
+};
+Object.prototype.filter$1 = function($0) {
+  return this.noSuchMethod("filter", [$0]);
+};
+Object.prototype.genValue$2 = function($0, $1) {
+  return this.noSuchMethod("genValue", [$0, $1]);
+};
+Object.prototype.generate$1 = function($0) {
+  return this.noSuchMethod("generate", [$0]);
+};
+Object.prototype.generateBody$2 = function($0, $1) {
+  return this.noSuchMethod("generateBody", [$0, $1]);
+};
+Object.prototype.getBeginToken$0 = function() {
+  return this.noSuchMethod("getBeginToken", []);
+};
+Object.prototype.getConstructor$1 = function($0) {
+  return this.noSuchMethod("getConstructor", [$0]);
+};
+Object.prototype.getEndToken$0 = function() {
+  return this.noSuchMethod("getEndToken", []);
+};
+Object.prototype.getKeys$0 = function() {
+  return this.noSuchMethod("getKeys", []);
+};
+Object.prototype.getMember$1 = function($0) {
+  return this.noSuchMethod("getMember", [$0]);
+};
+Object.prototype.getOrMakeConcreteType$1 = function($0) {
+  return this.noSuchMethod("getOrMakeConcreteType", [$0]);
+};
+Object.prototype.get_$3 = function($0, $1, $2) {
+  return this.noSuchMethod("get_", [$0, $1, $2]);
+};
+Object.prototype.handleAssignmentExpression$1 = function($0) {
+  return this.noSuchMethod("handleAssignmentExpression", [$0]);
+};
+Object.prototype.handleBinaryExpression$1 = function($0) {
+  return this.noSuchMethod("handleBinaryExpression", [$0]);
+};
+Object.prototype.handleConditionalExpression$2 = function($0, $1) {
+  return this.noSuchMethod("handleConditionalExpression", [$0, $1]);
+};
+Object.prototype.handleFinalKeyword$1 = function($0) {
+  return this.noSuchMethod("handleFinalKeyword", [$0]);
+};
+Object.prototype.handleIdentifier$1 = function($0) {
+  return this.noSuchMethod("handleIdentifier", [$0]);
+};
+Object.prototype.handleLiteralBool$1 = function($0) {
+  return this.noSuchMethod("handleLiteralBool", [$0]);
+};
+Object.prototype.handleLiteralDouble$1 = function($0) {
+  return this.noSuchMethod("handleLiteralDouble", [$0]);
+};
+Object.prototype.handleLiteralInt$1 = function($0) {
+  return this.noSuchMethod("handleLiteralInt", [$0]);
+};
+Object.prototype.handleLiteralString$1 = function($0) {
+  return this.noSuchMethod("handleLiteralString", [$0]);
+};
+Object.prototype.handleNoArguments$1 = function($0) {
+  return this.noSuchMethod("handleNoArguments", [$0]);
+};
+Object.prototype.handleNoType$1 = function($0) {
+  return this.noSuchMethod("handleNoType", [$0]);
+};
 Object.prototype.handleNoTypeArguments$1 = function($0) {
   return this.noSuchMethod("handleNoTypeArguments", [$0]);
-}
-;
+};
 Object.prototype.handleNoTypeVariables$1 = function($0) {
   return this.noSuchMethod("handleNoTypeVariables", [$0]);
-}
-;
+};
+Object.prototype.handleVarKeyword$1 = function($0) {
+  return this.noSuchMethod("handleVarKeyword", [$0]);
+};
+Object.prototype.handleVoidKeyword$1 = function($0) {
+  return this.noSuchMethod("handleVoidKeyword", [$0]);
+};
+Object.prototype.hasNext$0 = function() {
+  return this.noSuchMethod("hasNext", []);
+};
+Object.prototype.hashCode$0 = function() {
+  return this.noSuchMethod("hashCode", []);
+};
+Object.prototype.indexOf$2 = function($0, $1) {
+  return this.noSuchMethod("indexOf", [$0, $1]);
+};
+Object.prototype.instanceOf$3$isTrue$forceCheck = function($0, $1, $2, isTrue, forceCheck) {
+  return this.noSuchMethod("instanceOf", [$0, $1, $2, isTrue, forceCheck]);
+};
+Object.prototype.instanceOf$4 = function($0, $1, $2, $3) {
+  return this.noSuchMethod("instanceOf", [$0, $1, $2, $3]);
+};
 Object.prototype.invoke$4 = function($0, $1, $2, $3) {
   return this.noSuchMethod("invoke", [$0, $1, $2, $3]);
-}
-;
+};
+Object.prototype.invoke$4$isDynamic = function($0, $1, $2, $3, isDynamic) {
+  return this.noSuchMethod("invoke", [$0, $1, $2, $3, isDynamic]);
+};
+Object.prototype.invoke$5 = function($0, $1, $2, $3, $4) {
+  return this.noSuchMethod("invoke", [$0, $1, $2, $3, $4]);
+};
+Object.prototype.isAssignable$1 = function($0) {
+  return this.noSuchMethod("isAssignable", [$0]);
+};
+Object.prototype.isEmpty$0 = function() {
+  return this.noSuchMethod("isEmpty", []);
+};
+Object.prototype.isExitBlock$0 = function() {
+  return this.noSuchMethod("isExitBlock", []);
+};
+Object.prototype.isInBasicBlock$0 = function() {
+  return this.noSuchMethod("isInBasicBlock", []);
+};
+Object.prototype.isLiteralNumber$0 = function() {
+  return this.noSuchMethod("isLiteralNumber", []);
+};
+Object.prototype.isLiteralString$0 = function() {
+  return this.noSuchMethod("isLiteralString", []);
+};
+Object.prototype.isSubtypeOf$1 = function($0) {
+  return this.noSuchMethod("isSubtypeOf", [$0]);
+};
+Object.prototype.iterator$0 = function() {
+  return this.noSuchMethod("iterator", []);
+};
+Object.prototype.last$0 = function() {
+  return this.noSuchMethod("last", []);
+};
+Object.prototype.lookup$1 = function($0) {
+  return this.noSuchMethod("lookup", [$0]);
+};
+Object.prototype.markUsed$0 = function() {
+  return this.noSuchMethod("markUsed", []);
+};
+Object.prototype.namesInOrder$1 = function($0) {
+  return this.noSuchMethod("namesInOrder", [$0]);
+};
+Object.prototype.needsConversion$1 = function($0) {
+  return this.noSuchMethod("needsConversion", [$0]);
+};
+Object.prototype.next$0 = function() {
+  return this.noSuchMethod("next", []);
+};
+Object.prototype.parseClass$1 = function($0) {
+  return this.noSuchMethod("parseClass", [$0]);
+};
+Object.prototype.parseFunction$1 = function($0) {
+  return this.noSuchMethod("parseFunction", [$0]);
+};
+Object.prototype.printOn$1 = function($0) {
+  return this.noSuchMethod("printOn", [$0]);
+};
+Object.prototype.provideFieldSyntax$0 = function() {
+  return this.noSuchMethod("provideFieldSyntax", []);
+};
+Object.prototype.providePropertySyntax$0 = function() {
+  return this.noSuchMethod("providePropertySyntax", []);
+};
+Object.prototype.removeLast$0 = function() {
+  return this.noSuchMethod("removeLast", []);
+};
+Object.prototype.replaceAll$2 = function($0, $1) {
+  return this.noSuchMethod("replaceAll", [$0, $1]);
+};
+Object.prototype.replaceFirst$2 = function($0, $1) {
+  return this.noSuchMethod("replaceFirst", [$0, $1]);
+};
+Object.prototype.resolve$0 = function() {
+  return this.noSuchMethod("resolve", []);
+};
+Object.prototype.resolve$1 = function($0) {
+  return this.noSuchMethod("resolve", [$0]);
+};
+Object.prototype.resolve$2 = function($0, $1) {
+  return this.noSuchMethod("resolve", [$0, $1]);
+};
+Object.prototype.resolveMember$1 = function($0) {
+  return this.noSuchMethod("resolveMember", [$0]);
+};
+Object.prototype.resolveTypeParams$1 = function($0) {
+  return this.noSuchMethod("resolveTypeParams", [$0]);
+};
+Object.prototype.setDefinition$1 = function($0) {
+  return this.noSuchMethod("setDefinition", [$0]);
+};
+Object.prototype.setGenerateAtUseSite$0 = function() {
+  return this.noSuchMethod("setGenerateAtUseSite", []);
+};
+Object.prototype.set_$4 = function($0, $1, $2, $3) {
+  return this.noSuchMethod("set_", [$0, $1, $2, $3]);
+};
+Object.prototype.some$1 = function($0) {
+  return this.noSuchMethod("some", [$0]);
+};
+Object.prototype.sort$1 = function($0) {
+  return this.noSuchMethod("sort", [$0]);
+};
+Object.prototype.startsWith$1 = function($0) {
+  return this.noSuchMethod("startsWith", [$0]);
+};
+Object.prototype.substring$1 = function($0) {
+  return this.noSuchMethod("substring", [$0]);
+};
+Object.prototype.substring$2 = function($0, $1) {
+  return this.noSuchMethod("substring", [$0, $1]);
+};
+Object.prototype.toString$0 = function() {
+  return this.toString();
+};
+Object.prototype.unexpected$1 = function($0) {
+  return this.noSuchMethod("unexpected", [$0]);
+};
+Object.prototype.unexpectedEof$0 = function() {
+  return this.noSuchMethod("unexpectedEof", []);
+};
+Object.prototype.unimplemented$1 = function($0) {
+  return this.noSuchMethod("unimplemented", [$0]);
+};
+Object.prototype.visit$1 = function($0) {
+  return this.noSuchMethod("visit", [$0]);
+};
 Object.prototype.visitPostfixExpression$1 = function($0) {
   return this.noSuchMethod("visitPostfixExpression", [$0]);
-}
-;
+};
+Object.prototype.visitSources$0 = function() {
+  return this.noSuchMethod("visitSources", []);
+};
+Object.prototype.writeDefinition$2 = function($0, $1) {
+  return this.noSuchMethod("writeDefinition", [$0, $1]);
+};
 function $assert_bool(x) {
   if (x == null || typeof(x) == "boolean") return x;
   throw new TypeError("'" + x + "' is not a bool.");
@@ -255,6 +671,9 @@ function IllegalAccessException() {
 IllegalAccessException.prototype.toString = function() {
   return "Attempt to modify an immutable object";
 }
+IllegalAccessException.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for NoSuchMethodException **************
 function NoSuchMethodException(_receiver, _functionName, _arguments) {
   this._receiver = _receiver;
@@ -274,26 +693,41 @@ NoSuchMethodException.prototype.toString = function() {
   sb.add("]");
   return ("NoSuchMethodException - receiver: '" + this._receiver + "' ") + ("function name: '" + this._functionName + "' arguments: [" + sb + "]");
 }
+NoSuchMethodException.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for ObjectNotClosureException **************
 function ObjectNotClosureException() {}
 ObjectNotClosureException.prototype.toString = function() {
   return "Object is not closure";
 }
+ObjectNotClosureException.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for StackOverflowException **************
 function StackOverflowException() {}
 StackOverflowException.prototype.toString = function() {
   return "Stack Overflow";
 }
+StackOverflowException.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for BadNumberFormatException **************
 function BadNumberFormatException() {}
 BadNumberFormatException.prototype.toString = function() {
   return ("BadNumberFormatException: '" + this._s + "'");
 }
+BadNumberFormatException.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for NullPointerException **************
 function NullPointerException() {}
 NullPointerException.prototype.toString = function() {
   return "NullPointerException";
 }
+NullPointerException.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for NoMoreElementsException **************
 function NoMoreElementsException() {
   // Initializers done
@@ -301,6 +735,9 @@ function NoMoreElementsException() {
 NoMoreElementsException.prototype.toString = function() {
   return "NoMoreElementsException";
 }
+NoMoreElementsException.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for EmptyQueueException **************
 function EmptyQueueException() {
   // Initializers done
@@ -308,11 +745,17 @@ function EmptyQueueException() {
 EmptyQueueException.prototype.toString = function() {
   return "EmptyQueueException";
 }
+EmptyQueueException.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for IntegerDivisionByZeroException **************
 function IntegerDivisionByZeroException() {}
 IntegerDivisionByZeroException.prototype.toString = function() {
   return "IntegerDivisionByZeroException";
 }
+IntegerDivisionByZeroException.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for Function **************
 Function.prototype.to$call$0 = function() {
   this.call$0 = this.$genStub(0);
@@ -901,12 +1344,14 @@ ListFactory.prototype.is$List$String = function(){return this;};
 ListFactory.prototype.is$List$Type = function(){return this;};
 ListFactory.prototype.is$List$Value = function(){return this;};
 ListFactory.prototype.is$List$int = function(){return this;};
+ListFactory.prototype.is$Collection$E = function(){return this;};
+ListFactory.prototype.is$Collection$Object = function(){return this;};
 ListFactory.prototype.is$Collection$Type = function(){return this;};
 ListFactory.prototype.is$Iterable = function(){return this;};
 ListFactory.ListFactory$from$factory = function(other) {
   var list = [];
-  for (var $i = other.iterator(); $i.hasNext(); ) {
-    var e = $i.next();
+  for (var $i = other.iterator(); $i.hasNext$0(); ) {
+    var e = $i.next$0();
     list.add(e);
   }
   return (list && list.is$ListFactory());
@@ -918,8 +1363,8 @@ ListFactory.prototype.addLast = function(value) {
   this.push(value);
 }
 ListFactory.prototype.addAll = function(collection) {
-  for (var $i = collection.iterator(); $i.hasNext(); ) {
-    var item = $i.next();
+  for (var $i = collection.iterator(); $i.hasNext$0(); ) {
+    var item = $i.next$0();
     this.add(item);
   }
 }
@@ -941,6 +1386,26 @@ ListFactory.prototype.isEmpty = function() {
 ListFactory.prototype.iterator = function() {
   return new ListIterator(this);
 }
+ListFactory.prototype.add$1 = ListFactory.prototype.add;
+ListFactory.prototype.addAll$1 = function($0) {
+  return this.addAll(($0 && $0.is$Collection$E()));
+};
+ListFactory.prototype.filter$1 = ListFactory.prototype.filter;
+ListFactory.prototype.indexOf$2 = ListFactory.prototype.indexOf;
+ListFactory.prototype.isEmpty$0 = function() {
+  return this.isEmpty();
+};
+ListFactory.prototype.iterator$0 = function() {
+  return this.iterator();
+};
+ListFactory.prototype.last$0 = function() {
+  return this.last();
+};
+ListFactory.prototype.removeLast$0 = function() {
+  return this.removeLast();
+};
+ListFactory.prototype.some$1 = ListFactory.prototype.some;
+ListFactory.prototype.sort$1 = ListFactory.prototype.sort;
 ListFactory$DoubleLinkedQueueEntry$KeyValuePair$K$V = ListFactory;
 ListFactory$DoubleLinkedQueueEntry$KeyValuePair$Node$Element = ListFactory;
 ListFactory$DoubleLinkedQueueEntry$KeyValuePair$String$Keyword = ListFactory;
@@ -970,6 +1435,12 @@ ListIterator.prototype.next = function() {
   }
   return this._array.$index(this._pos++);
 }
+ListIterator.prototype.hasNext$0 = function() {
+  return this.hasNext();
+};
+ListIterator.prototype.next$0 = function() {
+  return this.next();
+};
 // ********** Code for ImmutableList **************
 function ImmutableList(length) {
   this._length = length;
@@ -1000,7 +1471,7 @@ ImmutableList.prototype.get$length = function() {
   return this._length;
 }
 ImmutableList.prototype.set$length = function(length) {
-  $throw(const$14/*const IllegalAccessException()*/);
+  $throw(const$4/*const IllegalAccessException()*/);
 }
 Object.defineProperty(ImmutableList.prototype, "length", {
   get: ImmutableList.prototype.get$length,
@@ -1010,32 +1481,40 @@ ImmutableList.prototype._setindex = function(index, value) {
   return this[index] = value;
 }
 ImmutableList.prototype.$setindex = function(index, value) {
-  $throw(const$14/*const IllegalAccessException()*/);
+  $throw(const$4/*const IllegalAccessException()*/);
 }
 ImmutableList.prototype.removeRange = function(start, length) {
-  $throw(const$14/*const IllegalAccessException()*/);
+  $throw(const$4/*const IllegalAccessException()*/);
 }
 ImmutableList.prototype.insertRange = function(start, length, initialValue) {
-  $throw(const$14/*const IllegalAccessException()*/);
+  $throw(const$4/*const IllegalAccessException()*/);
 }
 ImmutableList.prototype.sort = function(compare) {
-  $throw(const$14/*const IllegalAccessException()*/);
+  $throw(const$4/*const IllegalAccessException()*/);
 }
 ImmutableList.prototype.add = function(element) {
-  $throw(const$14/*const IllegalAccessException()*/);
+  $throw(const$4/*const IllegalAccessException()*/);
 }
 ImmutableList.prototype.addLast = function(element) {
-  $throw(const$14/*const IllegalAccessException()*/);
+  $throw(const$4/*const IllegalAccessException()*/);
 }
 ImmutableList.prototype.addAll = function(elements) {
-  $throw(const$14/*const IllegalAccessException()*/);
+  $throw(const$4/*const IllegalAccessException()*/);
 }
 ImmutableList.prototype.clear = function() {
-  $throw(const$14/*const IllegalAccessException()*/);
+  $throw(const$4/*const IllegalAccessException()*/);
 }
 ImmutableList.prototype.removeLast = function() {
-  $throw(const$14/*const IllegalAccessException()*/);
+  $throw(const$4/*const IllegalAccessException()*/);
 }
+ImmutableList.prototype.add$1 = ImmutableList.prototype.add;
+ImmutableList.prototype.addAll$1 = function($0) {
+  return this.addAll(($0 && $0.is$Collection$E()));
+};
+ImmutableList.prototype.removeLast$0 = function() {
+  return this.removeLast();
+};
+ImmutableList.prototype.sort$1 = ImmutableList.prototype.sort;
 // ********** Code for ImmutableMap **************
 function ImmutableMap(keyValuePairs) {
   this._internal = $map([]);
@@ -1072,8 +1551,14 @@ ImmutableMap.prototype.containsKey = function(key) {
   return this._internal.containsKey(key);
 }
 ImmutableMap.prototype.$setindex = function(key, value) {
-  $throw(const$14/*const IllegalAccessException()*/);
+  $throw(const$4/*const IllegalAccessException()*/);
 }
+ImmutableMap.prototype.getKeys$0 = function() {
+  return this.getKeys();
+};
+ImmutableMap.prototype.isEmpty$0 = function() {
+  return this.isEmpty();
+};
 // ********** Code for MatchImplementation **************
 function MatchImplementation(pattern, str, _start, _end, _groups) {
   this.pattern = pattern;
@@ -1088,6 +1573,8 @@ MatchImplementation.prototype.$index = function(group) {
 }
 // ********** Code for NumImplementation **************
 NumImplementation = Number;
+NumImplementation.prototype.is$NumImplementation = function(){return this;};
+NumImplementation.prototype.is$Comparable = function(){return this;};
 NumImplementation.prototype.isNaN = function() {
   return isNaN(this);
 }
@@ -1138,6 +1625,12 @@ NumImplementation.prototype.compareTo = function(other) {
     return -1;
   }
 }
+NumImplementation.prototype.compareTo$1 = function($0) {
+  return this.compareTo(($0 && $0.is$NumImplementation()));
+};
+NumImplementation.prototype.hashCode$0 = function() {
+  return this.hashCode();
+};
 // ********** Code for ExceptionImplementation **************
 function ExceptionImplementation(_msg) {
   this._msg = _msg;
@@ -1146,6 +1639,9 @@ function ExceptionImplementation(_msg) {
 ExceptionImplementation.prototype.toString = function() {
   return (this._msg == null) ? "Exception" : ("Exception: " + this._msg + "");
 }
+ExceptionImplementation.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for HashMapImplementation **************
 function HashMapImplementation() {
   // Initializers done
@@ -1179,7 +1675,7 @@ HashMapImplementation._nextProbe = function(currentProbe, numberOfProbes, length
   return (currentProbe + numberOfProbes) & (length - 1);
 }
 HashMapImplementation.prototype._probeForAdding = function(key) {
-  var hash = HashMapImplementation._firstProbe($assert_num(key.hashCode()), this._keys.length);
+  var hash = HashMapImplementation._firstProbe($assert_num(key.hashCode$0()), this._keys.length);
   var numberOfProbes = 1;
   var initialHash = hash;
   var insertionIndex = -1;
@@ -1189,7 +1685,7 @@ HashMapImplementation.prototype._probeForAdding = function(key) {
       if (insertionIndex < 0) return hash;
       return insertionIndex;
     }
-    else if ($eq(existingKey, key)) {
+    else if ($notnull_bool($eq(existingKey, key))) {
       return hash;
     }
     else if ((insertionIndex < 0) && (HashMapImplementation._deletedKey === existingKey)) {
@@ -1199,13 +1695,13 @@ HashMapImplementation.prototype._probeForAdding = function(key) {
   }
 }
 HashMapImplementation.prototype._probeForLookup = function(key) {
-  var hash = HashMapImplementation._firstProbe($assert_num(key.hashCode()), this._keys.length);
+  var hash = HashMapImplementation._firstProbe($assert_num(key.hashCode$0()), this._keys.length);
   var numberOfProbes = 1;
   var initialHash = hash;
   while (true) {
     var existingKey = this._keys.$index(hash);
     if (existingKey == null) return -1;
-    if ($eq(existingKey, key)) return hash;
+    if ($notnull_bool($eq(existingKey, key))) return hash;
     hash = HashMapImplementation._nextProbe(hash, numberOfProbes++, this._keys.length);
   }
 }
@@ -1311,6 +1807,12 @@ HashMapImplementation.prototype.getValues = function() {
 HashMapImplementation.prototype.containsKey = function(key) {
   return (this._probeForLookup(key) != -1);
 }
+HashMapImplementation.prototype.getKeys$0 = function() {
+  return this.getKeys();
+};
+HashMapImplementation.prototype.isEmpty$0 = function() {
+  return this.isEmpty();
+};
 // ********** Code for HashMapImplementation$E$E **************
 function HashMapImplementation$E$E() {
   // Initializers done
@@ -1336,7 +1838,7 @@ HashMapImplementation$E$E._nextProbe = function(currentProbe, numberOfProbes, le
   return (currentProbe + numberOfProbes) & (length - 1);
 }
 HashMapImplementation$E$E.prototype._probeForAdding = function(key) {
-  var hash = HashMapImplementation._firstProbe($assert_num(key.hashCode()), this._keys.length);
+  var hash = HashMapImplementation._firstProbe($assert_num(key.hashCode$0()), this._keys.length);
   var numberOfProbes = 1;
   var initialHash = hash;
   var insertionIndex = -1;
@@ -1346,7 +1848,7 @@ HashMapImplementation$E$E.prototype._probeForAdding = function(key) {
       if (insertionIndex < 0) return hash;
       return insertionIndex;
     }
-    else if ($eq(existingKey, key)) {
+    else if ($notnull_bool($eq(existingKey, key))) {
       return hash;
     }
     else if ((insertionIndex < 0) && (HashMapImplementation._deletedKey === existingKey)) {
@@ -1356,13 +1858,13 @@ HashMapImplementation$E$E.prototype._probeForAdding = function(key) {
   }
 }
 HashMapImplementation$E$E.prototype._probeForLookup = function(key) {
-  var hash = HashMapImplementation._firstProbe($assert_num(key.hashCode()), this._keys.length);
+  var hash = HashMapImplementation._firstProbe($assert_num(key.hashCode$0()), this._keys.length);
   var numberOfProbes = 1;
   var initialHash = hash;
   while (true) {
     var existingKey = this._keys.$index(hash);
     if (existingKey == null) return -1;
-    if ($eq(existingKey, key)) return hash;
+    if ($notnull_bool($eq(existingKey, key))) return hash;
     hash = HashMapImplementation._nextProbe(hash, numberOfProbes++, this._keys.length);
   }
 }
@@ -1588,12 +2090,14 @@ function HashSetImplementation() {
   this._backingMap = new HashMapImplementation$E$E();
 }
 HashSetImplementation.prototype.is$HashSetImplementation = function(){return this;};
+HashSetImplementation.prototype.is$Collection$E = function(){return this;};
+HashSetImplementation.prototype.is$Collection$Object = function(){return this;};
 HashSetImplementation.prototype.is$Collection$Type = function(){return this;};
 HashSetImplementation.prototype.is$Iterable = function(){return this;};
 HashSetImplementation.HashSetImplementation$from$factory = function(other) {
   var set = new HashSetImplementation();
-  for (var $i = other.iterator(); $i.hasNext(); ) {
-    var e = $i.next();
+  for (var $i = other.iterator(); $i.hasNext$0(); ) {
+    var e = $i.next$0();
     set.add(e);
   }
   return (set && set.is$HashSetImplementation());
@@ -1646,12 +2150,27 @@ Object.defineProperty(HashSetImplementation.prototype, "length", {
 HashSetImplementation.prototype.iterator = function() {
   return new HashSetIterator$E(this);
 }
+HashSetImplementation.prototype.add$1 = HashSetImplementation.prototype.add;
+HashSetImplementation.prototype.addAll$1 = function($0) {
+  return this.addAll(($0 && $0.is$Collection$E()));
+};
+HashSetImplementation.prototype.contains$1 = HashSetImplementation.prototype.contains;
+HashSetImplementation.prototype.filter$1 = HashSetImplementation.prototype.filter;
+HashSetImplementation.prototype.isEmpty$0 = function() {
+  return this.isEmpty();
+};
+HashSetImplementation.prototype.iterator$0 = function() {
+  return this.iterator();
+};
+HashSetImplementation.prototype.some$1 = HashSetImplementation.prototype.some;
 // ********** Code for HashSetImplementation$E **************
 function HashSetImplementation$E() {
   // Initializers done
   this._backingMap = new HashMapImplementation$E$E();
 }
 $inherits(HashSetImplementation$E, HashSetImplementation);
+HashSetImplementation$E.prototype.is$Collection$E = function(){return this;};
+HashSetImplementation$E.prototype.is$Collection$Object = function(){return this;};
 HashSetImplementation$E.prototype.is$Collection$Type = function(){return this;};
 HashSetImplementation$E.prototype.is$Iterable = function(){return this;};
 // ********** Code for HashSetImplementation$String **************
@@ -1660,6 +2179,8 @@ function HashSetImplementation$String() {
   this._backingMap = new HashMapImplementation$String$String();
 }
 $inherits(HashSetImplementation$String, HashSetImplementation);
+HashSetImplementation$String.prototype.is$Collection$E = function(){return this;};
+HashSetImplementation$String.prototype.is$Collection$Object = function(){return this;};
 HashSetImplementation$String.prototype.is$Collection$Type = false;
 HashSetImplementation$String.prototype.is$Iterable = function(){return this;};
 // ********** Code for HashSetImplementation$Type **************
@@ -1668,6 +2189,8 @@ function HashSetImplementation$Type() {
   this._backingMap = new HashMapImplementation$Type$Type();
 }
 $inherits(HashSetImplementation$Type, HashSetImplementation);
+HashSetImplementation$Type.prototype.is$Collection$E = function(){return this;};
+HashSetImplementation$Type.prototype.is$Collection$Object = function(){return this;};
 HashSetImplementation$Type.prototype.is$Collection$Type = function(){return this;};
 HashSetImplementation$Type.prototype.is$Iterable = function(){return this;};
 // ********** Code for HashSetIterator **************
@@ -1703,6 +2226,12 @@ HashSetIterator.prototype._advance = function() {
   }
   while ((entry == null) || (entry === deletedKey))
 }
+HashSetIterator.prototype.hasNext$0 = function() {
+  return this.hasNext();
+};
+HashSetIterator.prototype.next$0 = function() {
+  return this.next();
+};
 // ********** Code for HashSetIterator$E **************
 function HashSetIterator$E(set_) {
   this._nextValidIndex = -1;
@@ -1804,6 +2333,12 @@ Object.defineProperty(LinkedHashMapImplementation.prototype, "length", {
 LinkedHashMapImplementation.prototype.isEmpty = function() {
   return this.get$length() == 0;
 }
+LinkedHashMapImplementation.prototype.getKeys$0 = function() {
+  return this.getKeys();
+};
+LinkedHashMapImplementation.prototype.isEmpty$0 = function() {
+  return this.isEmpty();
+};
 // ********** Code for LinkedHashMapImplementation$Node$Element **************
 function LinkedHashMapImplementation$Node$Element() {
   // Initializers done
@@ -1908,13 +2443,13 @@ function _DoubleLinkedQueueEntrySentinel() {
 }
 $inherits(_DoubleLinkedQueueEntrySentinel, DoubleLinkedQueueEntry$E);
 _DoubleLinkedQueueEntrySentinel.prototype.remove = function() {
-  $throw(const$5/*const EmptyQueueException()*/);
+  $throw(const$9/*const EmptyQueueException()*/);
 }
 _DoubleLinkedQueueEntrySentinel.prototype._asNonSentinelEntry = function() {
   return null;
 }
 _DoubleLinkedQueueEntrySentinel.prototype.get$element = function() {
-  $throw(const$5/*const EmptyQueueException()*/);
+  $throw(const$9/*const EmptyQueueException()*/);
 }
 // ********** Code for _DoubleLinkedQueueEntrySentinel$E **************
 function _DoubleLinkedQueueEntrySentinel$E() {
@@ -1987,12 +2522,14 @@ function DoubleLinkedQueue() {
   this._sentinel = new _DoubleLinkedQueueEntrySentinel$E();
 }
 DoubleLinkedQueue.prototype.is$DoubleLinkedQueue = function(){return this;};
+DoubleLinkedQueue.prototype.is$Collection$E = function(){return this;};
+DoubleLinkedQueue.prototype.is$Collection$Object = function(){return this;};
 DoubleLinkedQueue.prototype.is$Collection$Type = function(){return this;};
 DoubleLinkedQueue.prototype.is$Iterable = function(){return this;};
 DoubleLinkedQueue.DoubleLinkedQueue$from$factory = function(other) {
   var list = new DoubleLinkedQueue();
-  for (var $i = other.iterator(); $i.hasNext(); ) {
-    var e = $i.next();
+  for (var $i = other.iterator(); $i.hasNext$0(); ) {
+    var e = $i.next$0();
     list.addLast(e);
   }
   return (list && list.is$DoubleLinkedQueue());
@@ -2004,8 +2541,8 @@ DoubleLinkedQueue.prototype.add = function(value) {
   this.addLast(value);
 }
 DoubleLinkedQueue.prototype.addAll = function(collection) {
-  for (var $i = collection.iterator(); $i.hasNext(); ) {
-    var e = $i.next();
+  for (var $i = collection.iterator(); $i.hasNext$0(); ) {
+    var e = $i.next$0();
     this.add(e);
   }
 }
@@ -2059,12 +2596,32 @@ DoubleLinkedQueue.prototype.filter = function(f) {
 DoubleLinkedQueue.prototype.iterator = function() {
   return new _DoubleLinkedQueueIterator$E(this._sentinel);
 }
+DoubleLinkedQueue.prototype.add$1 = DoubleLinkedQueue.prototype.add;
+DoubleLinkedQueue.prototype.addAll$1 = function($0) {
+  return this.addAll(($0 && $0.is$Collection$E()));
+};
+DoubleLinkedQueue.prototype.filter$1 = DoubleLinkedQueue.prototype.filter;
+DoubleLinkedQueue.prototype.isEmpty$0 = function() {
+  return this.isEmpty();
+};
+DoubleLinkedQueue.prototype.iterator$0 = function() {
+  return this.iterator();
+};
+DoubleLinkedQueue.prototype.last$0 = function() {
+  return this.last();
+};
+DoubleLinkedQueue.prototype.removeLast$0 = function() {
+  return this.removeLast();
+};
+DoubleLinkedQueue.prototype.some$1 = DoubleLinkedQueue.prototype.some;
 // ********** Code for DoubleLinkedQueue$E **************
 function DoubleLinkedQueue$E() {
   // Initializers done
   this._sentinel = new _DoubleLinkedQueueEntrySentinel$E();
 }
 $inherits(DoubleLinkedQueue$E, DoubleLinkedQueue);
+DoubleLinkedQueue$E.prototype.is$Collection$E = function(){return this;};
+DoubleLinkedQueue$E.prototype.is$Collection$Object = function(){return this;};
 DoubleLinkedQueue$E.prototype.is$Collection$Type = function(){return this;};
 DoubleLinkedQueue$E.prototype.is$Iterable = function(){return this;};
 // ********** Code for DoubleLinkedQueue$KeyValuePair$K$V **************
@@ -2073,6 +2630,8 @@ function DoubleLinkedQueue$KeyValuePair$K$V() {
   this._sentinel = new _DoubleLinkedQueueEntrySentinel$KeyValuePair$K$V();
 }
 $inherits(DoubleLinkedQueue$KeyValuePair$K$V, DoubleLinkedQueue);
+DoubleLinkedQueue$KeyValuePair$K$V.prototype.is$Collection$E = function(){return this;};
+DoubleLinkedQueue$KeyValuePair$K$V.prototype.is$Collection$Object = function(){return this;};
 DoubleLinkedQueue$KeyValuePair$K$V.prototype.is$Collection$Type = false;
 DoubleLinkedQueue$KeyValuePair$K$V.prototype.is$Iterable = function(){return this;};
 DoubleLinkedQueue$KeyValuePair$K$V.prototype.addLast = function(value) {
@@ -2094,6 +2653,8 @@ function DoubleLinkedQueue$KeyValuePair$Node$Element() {
   this._sentinel = new _DoubleLinkedQueueEntrySentinel$KeyValuePair$Node$Element();
 }
 $inherits(DoubleLinkedQueue$KeyValuePair$Node$Element, DoubleLinkedQueue);
+DoubleLinkedQueue$KeyValuePair$Node$Element.prototype.is$Collection$E = function(){return this;};
+DoubleLinkedQueue$KeyValuePair$Node$Element.prototype.is$Collection$Object = function(){return this;};
 DoubleLinkedQueue$KeyValuePair$Node$Element.prototype.is$Collection$Type = false;
 DoubleLinkedQueue$KeyValuePair$Node$Element.prototype.is$Iterable = function(){return this;};
 // ********** Code for DoubleLinkedQueue$KeyValuePair$String$Keyword **************
@@ -2102,17 +2663,21 @@ function DoubleLinkedQueue$KeyValuePair$String$Keyword() {
   this._sentinel = new _DoubleLinkedQueueEntrySentinel$KeyValuePair$String$Keyword();
 }
 $inherits(DoubleLinkedQueue$KeyValuePair$String$Keyword, DoubleLinkedQueue);
+DoubleLinkedQueue$KeyValuePair$String$Keyword.prototype.is$Collection$E = function(){return this;};
+DoubleLinkedQueue$KeyValuePair$String$Keyword.prototype.is$Collection$Object = function(){return this;};
 DoubleLinkedQueue$KeyValuePair$String$Keyword.prototype.is$Collection$Type = false;
 DoubleLinkedQueue$KeyValuePair$String$Keyword.prototype.is$Iterable = function(){return this;};
 // ********** Code for DoubleLinkedQueue$SourceString **************
 function DoubleLinkedQueue$SourceString() {}
 $inherits(DoubleLinkedQueue$SourceString, DoubleLinkedQueue);
+DoubleLinkedQueue$SourceString.prototype.is$Collection$E = function(){return this;};
+DoubleLinkedQueue$SourceString.prototype.is$Collection$Object = function(){return this;};
 DoubleLinkedQueue$SourceString.prototype.is$Collection$Type = false;
 DoubleLinkedQueue$SourceString.prototype.is$Iterable = function(){return this;};
 DoubleLinkedQueue$SourceString.DoubleLinkedQueue$from$factory = function(other) {
   var list = new DoubleLinkedQueue();
-  for (var $i = other.iterator(); $i.hasNext(); ) {
-    var e = $i.next();
+  for (var $i = other.iterator(); $i.hasNext$0(); ) {
+    var e = $i.next$0();
     list.addLast(e);
   }
   return (list && list.is$DoubleLinkedQueue());
@@ -2134,6 +2699,12 @@ _DoubleLinkedQueueIterator.prototype.next = function() {
   this._currentEntry = this._currentEntry._next;
   return this._currentEntry.get$element();
 }
+_DoubleLinkedQueueIterator.prototype.hasNext$0 = function() {
+  return this.hasNext();
+};
+_DoubleLinkedQueueIterator.prototype.next$0 = function() {
+  return this.next();
+};
 // ********** Code for _DoubleLinkedQueueIterator$E **************
 function _DoubleLinkedQueueIterator$E(_sentinel) {
   this._sentinel = _sentinel;
@@ -2183,6 +2754,7 @@ function StringBufferImpl(content) {
   this.clear();
   this.add(content);
 }
+StringBufferImpl.prototype.is$StringBuffer = function(){return this;};
 StringBufferImpl.prototype.get$length = function() {
   return this._length;
 }
@@ -2193,15 +2765,15 @@ StringBufferImpl.prototype.isEmpty = function() {
   return this._length == 0;
 }
 StringBufferImpl.prototype.add = function(obj) {
-  var str = obj.toString();
+  var str = $assert_String(obj.toString());
   if (str == null || str.isEmpty()) return this;
   this._buffer.add(str);
   this._length += str.length;
   return this;
 }
 StringBufferImpl.prototype.addAll = function(objects) {
-  for (var $i = objects.iterator(); $i.hasNext(); ) {
-    var obj = $i.next();
+  for (var $i = objects.iterator(); $i.hasNext$0(); ) {
+    var obj = $i.next$0();
     this.add(obj);
   }
   return this;
@@ -2219,6 +2791,16 @@ StringBufferImpl.prototype.toString = function() {
   this._buffer.add(result);
   return result;
 }
+StringBufferImpl.prototype.add$1 = StringBufferImpl.prototype.add;
+StringBufferImpl.prototype.addAll$1 = function($0) {
+  return this.addAll(($0 && $0.is$Collection$Object()));
+};
+StringBufferImpl.prototype.isEmpty$0 = function() {
+  return this.isEmpty();
+};
+StringBufferImpl.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for StringBase **************
 function StringBase() {}
 StringBase.createFromCharCodes = function(charCodes) {
@@ -2246,6 +2828,8 @@ StringBase.concatAll = function(strings) {
 }
 // ********** Code for StringImplementation **************
 StringImplementation = String;
+StringImplementation.prototype.is$Pattern = function(){return this;};
+StringImplementation.prototype.is$Comparable = function(){return this;};
 StringImplementation.prototype.endsWith = function(other) {
   if (other.length > this.length) return false;
     return other == this.substring(this.length - other.length);
@@ -2285,24 +2869,57 @@ StringImplementation.prototype.hashCode = function() {
 StringImplementation.prototype.compareTo = function(other) {
   return this == other ? 0 : this < other ? -1 : 1;
 }
+StringImplementation.prototype.charCodeAt$1 = function($0) {
+  return this.charCodeAt($assert_num($0));
+};
+StringImplementation.prototype.compareTo$1 = function($0) {
+  return this.compareTo($assert_String($0));
+};
+StringImplementation.prototype.endsWith$1 = function($0) {
+  return this.endsWith($assert_String($0));
+};
+StringImplementation.prototype.hashCode$0 = function() {
+  return this.hashCode();
+};
+StringImplementation.prototype.indexOf$2 = function($0, $1) {
+  return this.indexOf($assert_String($0), $assert_num($1));
+};
+StringImplementation.prototype.isEmpty$0 = function() {
+  return this.isEmpty();
+};
+StringImplementation.prototype.replaceAll$2 = function($0, $1) {
+  return this.replaceAll(($0 && $0.is$Pattern()), $assert_String($1));
+};
+StringImplementation.prototype.replaceFirst$2 = function($0, $1) {
+  return this.replaceFirst(($0 && $0.is$Pattern()), $assert_String($1));
+};
+StringImplementation.prototype.startsWith$1 = function($0) {
+  return this.startsWith($assert_String($0));
+};
+StringImplementation.prototype.substring$1 = function($0) {
+  return this.substring($assert_num($0));
+};
+StringImplementation.prototype.substring$2 = function($0, $1) {
+  return this.substring($assert_num($0), $assert_num($1));
+};
 // ********** Code for Collections **************
 function Collections() {}
 Collections.forEach = function(iterable, f) {
-  for (var $i = iterable.iterator(); $i.hasNext(); ) {
-    var e = $i.next();
+  for (var $i = iterable.iterator(); $i.hasNext$0(); ) {
+    var e = $i.next$0();
     f(e);
   }
 }
 Collections.some = function(iterable, f) {
-  for (var $i = iterable.iterator(); $i.hasNext(); ) {
-    var e = $i.next();
+  for (var $i = iterable.iterator(); $i.hasNext$0(); ) {
+    var e = $i.next$0();
     if (f(e)) return true;
   }
   return false;
 }
 Collections.filter = function(source, destination, f) {
-  for (var $i = source.iterator(); $i.hasNext(); ) {
-    var e = $i.next();
+  for (var $i = source.iterator(); $i.hasNext$0(); ) {
+    var e = $i.next$0();
     if (f(e)) destination.add(e);
   }
   return destination;
@@ -2322,6 +2939,8 @@ DateImplementation.now$ctor = function() {
   this._asJs();
 }
 DateImplementation.now$ctor.prototype = DateImplementation.prototype;
+DateImplementation.prototype.is$Date = function(){return this;};
+DateImplementation.prototype.is$Comparable = function(){return this;};
 DateImplementation.prototype.get$value = function() { return this.value; };
 DateImplementation.prototype.$eq = function(other) {
   if (!((other instanceof DateImplementation))) return false;
@@ -2389,6 +3008,15 @@ DateImplementation.prototype._asJs = function() {
     }
     return this.date;
 }
+DateImplementation.prototype.add$1 = function($0) {
+  return this.add(($0 && $0.is$Duration()));
+};
+DateImplementation.prototype.compareTo$1 = function($0) {
+  return this.compareTo(($0 && $0.is$Date()));
+};
+DateImplementation.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for TimeZoneImplementation **************
 function TimeZoneImplementation() {}
 TimeZoneImplementation.local$ctor = function() {
@@ -2404,6 +3032,9 @@ TimeZoneImplementation.prototype.toString = function() {
   if ($notnull_bool(this.isUtc)) return "TimeZone (UTC)";
   return "TimeZone (Local)";
 }
+TimeZoneImplementation.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for top level **************
 //  ********** Library node **************
 // ********** Code for process **************
@@ -2425,14 +3056,14 @@ function joinPaths(path1, path2) {
   var $list = path2.split('/');
   for (var $i = 0;$i < $list.length; $i++) {
     var piece = $list.$index($i);
-    if ($notnull_bool($notnull_bool($notnull_bool($eq(piece, '..') && pieces.length > 0) && $ne(pieces.last(), '.')) && $ne(pieces.last(), '..'))) {
-      pieces.removeLast();
+    if ($notnull_bool($notnull_bool($notnull_bool($eq(piece, '..') && pieces.length > 0) && $ne(pieces.last$0(), '.')) && $ne(pieces.last$0(), '..'))) {
+      pieces.removeLast$0();
     }
     else if ($notnull_bool($ne(piece, ''))) {
-      if ($notnull_bool(pieces.length > 0 && $eq(pieces.last(), '.'))) {
-        pieces.removeLast();
+      if ($notnull_bool(pieces.length > 0 && $eq(pieces.last$0(), '.'))) {
+        pieces.removeLast$0();
       }
-      pieces.add(piece);
+      pieces.add$1(piece);
     }
   }
   return Strings.join((pieces && pieces.is$List$String()), '/');
@@ -2483,7 +3114,7 @@ function readSync(fileName) {
 function LinkFactory() {}
 LinkFactory.createLink = function(head, tail) {
   var $0;
-  return new LinkEntry(head, (($0 = (tail == null) ? const$16/*const EmptyLink()*/ : tail) && $0.is$Link$T()));
+  return new LinkEntry(head, (($0 = (tail == null) ? const$18/*const EmptyLink()*/ : tail) && $0.is$Link$T()));
 }
 // ********** Code for AbstractLink **************
 function AbstractLink() {}
@@ -2505,7 +3136,7 @@ AbstractLink.prototype.prepend = function(element) {
 }
 AbstractLink.prototype.iterator = function() {
   var $0;
-  return (($0 = this.toList().iterator()) && $0.is$Iterator$T());
+  return (($0 = this.toList().iterator$0()) && $0.is$Iterator$T());
 }
 AbstractLink.prototype.printOn = function(buffer, separatedBy) {
   var $0;
@@ -2525,6 +3156,18 @@ AbstractLink.prototype.toString = function() {
   buffer.add(' ]');
   return buffer.toString();
 }
+AbstractLink.prototype.isEmpty$0 = function() {
+  return this.isEmpty();
+};
+AbstractLink.prototype.iterator$0 = function() {
+  return this.iterator();
+};
+AbstractLink.prototype.printOn$1 = function($0) {
+  return this.printOn(($0 && $0.is$StringBuffer()));
+};
+AbstractLink.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for AbstractLink$T **************
 function AbstractLink$T() {}
 $inherits(AbstractLink$T, AbstractLink);
@@ -2537,7 +3180,7 @@ AbstractLink$T.prototype.is$Link$Type = function(){return this;};
 AbstractLink$T.prototype.is$Iterable = function(){return this;};
 AbstractLink$T.prototype.iterator = function() {
   var $0;
-  return (($0 = this.toList().iterator()) && $0.is$Iterator$T());
+  return (($0 = this.toList().iterator$0()) && $0.is$Iterator$T());
 }
 // ********** Code for LinkTail **************
 function LinkTail() {
@@ -2558,11 +3201,14 @@ LinkTail.prototype.get$tail = function() {
   return null;
 }
 LinkTail.prototype.toList = function() {
-  return const$15/*const []*/;
+  return const$5/*const <HInstruction>[]*/;
 }
 LinkTail.prototype.isEmpty = function() {
   return true;
 }
+LinkTail.prototype.isEmpty$0 = function() {
+  return this.isEmpty();
+};
 // ********** Code for LinkTail$Node **************
 function LinkTail$Node() {
   // Initializers done
@@ -2598,6 +3244,9 @@ LinkEntry.prototype.toList = function() {
   }
   return list;
 }
+LinkEntry.prototype.isEmpty$0 = function() {
+  return this.isEmpty();
+};
 // ********** Code for LinkEntry$T **************
 function LinkEntry$T(head, realTail) {
   this.head = head;
@@ -2614,8 +3263,8 @@ function LinkBuilderImplementation() {
 LinkBuilderImplementation.prototype.get$head = function() { return this.head; };
 LinkBuilderImplementation.prototype.set$head = function(value) { return this.head = value; };
 LinkBuilderImplementation.prototype.toLink = function() {
-  if (this.head == null) return const$16/*const EmptyLink()*/;
-  this.lastLink.realTail = const$16/*const EmptyLink()*/;
+  if (this.head == null) return const$18/*const EmptyLink()*/;
+  this.lastLink.realTail = const$18/*const EmptyLink()*/;
   var link = this.head;
   this.lastLink = null;
   this.head = null;
@@ -2644,7 +3293,7 @@ $inherits(LinkBuilderImplementation$Type, LinkBuilderImplementation);
 //  ********** Library scanner_implementation **************
 // ********** Code for ArrayBasedScanner **************
 function ArrayBasedScanner() {
-  this.groupingStack = const$16/*const EmptyLink()*/
+  this.groupingStack = const$18/*const EmptyLink()*/
   this.extraCharOffset = 0;
   this.tokenStart = -1;
   this.byteOffset = -1;
@@ -2761,7 +3410,7 @@ ArrayBasedScanner.prototype.appendGtGtGt = function(kind, value) {
 }
 // ********** Code for ArrayBasedScanner$SourceString **************
 function ArrayBasedScanner$SourceString() {
-  this.groupingStack = const$16/*const EmptyLink()*/
+  this.groupingStack = const$18/*const EmptyLink()*/
   this.extraCharOffset = 0;
   this.tokenStart = -1;
   this.byteOffset = -1;
@@ -4405,7 +5054,7 @@ AbstractScanner.prototype.tokenizeIdentifier = function(next) {
         next = this.nextByte();
       }
       while (next > 127)
-      var string = $assert_String(this.utf8String(nonAsciiStart, -1).toString());
+      var string = this.utf8String(nonAsciiStart, -1).toString$0();
       isAscii = false;
       this.addToCharOffset(string.length);
       return next;
@@ -5218,7 +5867,7 @@ AbstractScanner$S.prototype.tokenizeIdentifier = function(next) {
         next = this.nextByte();
       }
       while (next > 127)
-      var string = $assert_String(this.utf8String(nonAsciiStart, -1).toString());
+      var string = this.utf8String(nonAsciiStart, -1).toString$0();
       isAscii = false;
       this.addToCharOffset(string.length);
       return next;
@@ -5312,8 +5961,11 @@ function MalformedInputException(message) {
   // Initializers done
 }
 MalformedInputException.prototype.toString = function() {
-  return this.message.toString();
+  return this.message.toString$0();
 }
+MalformedInputException.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for ScannerTask **************
 function ScannerTask(compiler) {
   CompilerTask.call(this, compiler);
@@ -5385,7 +6037,7 @@ PartialParser.prototype.next = function(token) {
 }
 PartialParser.prototype.checkEof = function(token) {
   if (token.kind === 0/*null.EOF_TOKEN*/) {
-    this.listener.unexpectedEof();
+    this.listener.unexpectedEof$0();
     $throw('Unexpected EOF');
   }
   return token;
@@ -5423,7 +6075,7 @@ PartialParser.prototype.parseUnit = function(token) {
   }
 }
 PartialParser.prototype.parseInterface = function(token) {
-  this.listener.beginInterface(token);
+  this.listener.beginInterface$1(token);
   token = this.parseIdentifier(this.next(token));
   token = this.parseTypeVariablesOpt(token);
   token = this.parseSupertypesClauseOpt(token);
@@ -5432,21 +6084,21 @@ PartialParser.prototype.parseInterface = function(token) {
 }
 PartialParser.prototype.parseInterfaceBody = function(token) {
   token = this.skipBlock(token);
-  this.listener.endInterface(token);
+  this.listener.endInterface$1(token);
   return token.next;
 }
 PartialParser.prototype.parseNamedFunctionAlias = function(token) {
-  this.listener.beginFunctionTypeAlias(token);
+  this.listener.beginFunctionTypeAlias$1(token);
   token = this.parseReturnTypeOpt(this.next(token));
   token = this.parseIdentifier(token);
   token = this.parseTypeVariablesOpt(token);
   token = this.parseFormalParameters(token);
-  this.listener.endFunctionTypeAlias(token);
+  this.listener.endFunctionTypeAlias$1(token);
   return this.expect(';', token);
 }
 PartialParser.prototype.parseReturnTypeOpt = function(token) {
   if (token.get$stringValue() === 'void') {
-    this.listener.handleVoidKeyword(token);
+    this.listener.handleVoidKeyword$1(token);
     return this.next(token);
   }
   else {
@@ -5455,22 +6107,22 @@ PartialParser.prototype.parseReturnTypeOpt = function(token) {
 }
 PartialParser.prototype.parseFormalParameters = function(token) {
   var begin = token;
-  this.listener.beginFormalParameters(begin);
+  this.listener.beginFormalParameters$1(begin);
   this.expect('(', token);
   var parameterCount = 0;
   if ($notnull_bool(this.optional(')', token.next))) {
-    this.listener.endFormalParameters(parameterCount, begin, token.next);
+    this.listener.endFormalParameters$3(parameterCount, begin, token.next);
     return token.next.next;
   }
   do {
-    this.listener.beginFormalParameter(token);
+    this.listener.beginFormalParameter$1(token);
     token = this.parseTypeOpt(this.next(token));
     token = this.parseIdentifier(token);
-    this.listener.endFormalParameter(token);
+    this.listener.endFormalParameter$1(token);
     ++parameterCount;
   }
   while ($notnull_bool(this.optional(',', token)))
-  this.listener.endFormalParameters(parameterCount, begin, token);
+  this.listener.endFormalParameters$3(parameterCount, begin, token);
   return this.expect(')', token);
 }
 PartialParser.prototype.parseTypeOpt = function(token) {
@@ -5484,7 +6136,7 @@ PartialParser.prototype.parseTypeOpt = function(token) {
 
     default:
 
-      this.listener.handleNoType(token);
+      this.listener.handleNoType$1(token);
       return token;
 
   }
@@ -5523,7 +6175,7 @@ PartialParser.prototype.parseFactoryClauseOpt = function(token) {
 }
 PartialParser.prototype.skipBlock = function(token) {
   if (!$notnull_bool(this.optional('{', token))) {
-    return this.listener.expectedBlock(token);
+    return this.listener.expectedBlock$1(token);
   }
   var beginGroupToken = (token && token.is$BeginGroupToken());
   $assert(beginGroupToken.endGroup == null || beginGroupToken.endGroup.kind === 125/*null.$RBRACE*/, "beginGroupToken.endGroup === null ||\n           beginGroupToken.endGroup.kind === $RBRACE", "parser.dart", 171, 12);
@@ -5534,7 +6186,7 @@ PartialParser.prototype.skipArguments = function(token) {
 }
 PartialParser.prototype.parseClass = function(token) {
   var begin = token;
-  this.listener.beginClass(token);
+  this.listener.beginClass$1(token);
   token = this.parseIdentifier(this.next(token));
   token = this.parseTypeVariablesOpt(token);
   var extendsKeyword;
@@ -5544,7 +6196,7 @@ PartialParser.prototype.parseClass = function(token) {
   }
   else {
     extendsKeyword = null;
-    this.listener.handleNoType(token);
+    this.listener.handleNoType$1(token);
   }
   var implementsKeyword;
   var interfacesCount = 0;
@@ -5557,7 +6209,7 @@ PartialParser.prototype.parseClass = function(token) {
   }
   token = this.parseNativeClassClauseOpt(token);
   token = this.parseClassBody(token);
-  this.listener.endClass(interfacesCount, begin, extendsKeyword, implementsKeyword, token);
+  this.listener.endClass$5(interfacesCount, begin, extendsKeyword, implementsKeyword, token);
   return token.next;
 }
 PartialParser.prototype.parseNativeClassClauseOpt = function(token) {
@@ -5567,19 +6219,20 @@ PartialParser.prototype.parseNativeClassClauseOpt = function(token) {
   return token;
 }
 PartialParser.prototype.parseString = function(token) {
+  var $0;
   if (token.kind === 39/*null.STRING_TOKEN*/) {
     return this.next(token);
   }
   else {
-    return this.listener.expected('string', token);
+    return (($0 = this.listener.expected$2('string', token)) && $0.is$Token());
   }
 }
 PartialParser.prototype.parseIdentifier = function(token) {
   if ($notnull_bool(this.isIdentifier(token))) {
-    this.listener.handleIdentifier(token);
+    this.listener.handleIdentifier$1(token);
   }
   else {
-    this.listener.expectedIdentifier(token);
+    this.listener.expectedIdentifier$1(token);
   }
   return this.next(token);
 }
@@ -5597,20 +6250,20 @@ PartialParser.prototype.expect = function(string, token) {
         return gtgt;
       }
     }
-    return this.listener.expected(string, token);
+    return this.listener.expected$2(string, token);
   }
   return token.next;
 }
 PartialParser.prototype.parseTypeVariable = function(token) {
-  this.listener.beginTypeVariable(token);
+  this.listener.beginTypeVariable$1(token);
   token = this.parseIdentifier(token);
   if ($notnull_bool(this.optional('extends', token))) {
     token = this.parseType(this.next(token));
   }
   else {
-    this.listener.handleNoType(token);
+    this.listener.handleNoType$1(token);
   }
-  this.listener.endTypeVariable(token);
+  this.listener.endTypeVariable$1(token);
   return token;
 }
 PartialParser.prototype.optional = function(value, token) {
@@ -5624,15 +6277,15 @@ PartialParser.prototype.parseType = function(token) {
     }
   }
   else if ($notnull_bool(this.optional('var', token))) {
-    this.listener.handleVarKeyword(token);
-    this.listener.endType(token);
+    this.listener.handleVarKeyword$1(token);
+    this.listener.endType$1(token);
     return this.next(token);
   }
   else {
-    token = this.listener.expectedType(token);
+    token = this.listener.expectedType$1(token);
   }
   token = this.parseTypeArgumentsOpt(token);
-  this.listener.endType(token);
+  this.listener.endType$1(token);
   return token;
 }
 PartialParser.prototype.parseTypeArgumentsOpt = function(token) {
@@ -5668,7 +6321,7 @@ PartialParser.prototype.parseClassBody = function(token) {
 }
 PartialParser.prototype.parseTopLevelMember = function(token) {
   var start = token;
-  this.listener.beginTopLevelMember(token);
+  this.listener.beginTopLevelMember$1(token);
   var previous = token;
   LOOP:
   while (token != null) {
@@ -5701,7 +6354,7 @@ PartialParser.prototype.parseTopLevelMember = function(token) {
       break;
     }
     else {
-      token = this.listener.unexpected(token);
+      token = this.listener.unexpected$1(token);
     }
   }
   if (!$notnull_bool(isField)) {
@@ -5714,15 +6367,15 @@ PartialParser.prototype.parseTopLevelMember = function(token) {
     token = this.skipBlock(token);
   }
   if ($notnull_bool(isField)) {
-    this.listener.endTopLevelField(start, token);
+    this.listener.endTopLevelField$2(start, token);
   }
   else {
-    this.listener.endTopLevelMethod(start, token);
+    this.listener.endTopLevelMethod$2(start, token);
   }
   return token.next;
 }
 PartialParser.prototype.parseLibraryTags = function(token) {
-  this.listener.beginLibraryTag(token);
+  this.listener.beginLibraryTag$1(token);
   token = this.parseIdentifier(this.next(token));
   token = this.expect('(', token);
   while (token != null && token.kind !== 40/*null.LPAREN_TOKEN*/ && token.kind !== 41/*null.RPAREN_TOKEN*/) {
@@ -5733,28 +6386,25 @@ PartialParser.prototype.parseLibraryTags = function(token) {
 }
 PartialParser.prototype.beginTypeArguments$1 = function($0) {
   return this.beginTypeArguments.call$1($0);
-}
-;
+};
 PartialParser.prototype.beginTypeVariables$1 = function($0) {
   return this.beginTypeVariables.call$1($0);
-}
-;
+};
 PartialParser.prototype.endTypeArguments$3 = function($0, $1, $2) {
   return this.endTypeArguments.call$3($0, $1, $2);
-}
-;
+};
 PartialParser.prototype.endTypeVariables$3 = function($0, $1, $2) {
   return this.endTypeVariables.call$3($0, $1, $2);
-}
-;
+};
 PartialParser.prototype.handleNoTypeArguments$1 = function($0) {
   return this.handleNoTypeArguments.call$1($0);
-}
-;
+};
 PartialParser.prototype.handleNoTypeVariables$1 = function($0) {
   return this.handleNoTypeVariables.call$1($0);
-}
-;
+};
+PartialParser.prototype.parseClass$1 = function($0) {
+  return this.parseClass(($0 && $0.is$Token()));
+};
 // ********** Code for Parser **************
 function Parser(listener) {
   PartialParser.call(this, listener);
@@ -5762,28 +6412,28 @@ function Parser(listener) {
 }
 $inherits(Parser, PartialParser);
 Parser.prototype.parseFunction = function(token) {
-  this.listener.beginFunction(token);
+  this.listener.beginFunction$1(token);
   token = this.parseReturnTypeOpt(token);
-  this.listener.beginFunctionName(token);
+  this.listener.beginFunctionName$1(token);
   token = this.parseIdentifier(token);
-  this.listener.endFunctionName(token);
+  this.listener.endFunctionName$1(token);
   token = this.parseFormalParameters(token);
   return this.parseFunctionBody(token);
 }
 Parser.prototype.parseFunctionBody = function(token) {
   if ($notnull_bool(this.optional(';', token))) {
-    this.listener.endFunctionBody(0, null, token);
+    this.listener.endFunctionBody$3(0, null, token);
     return token.next;
   }
   var begin = token;
   var statementCount = 0;
-  this.listener.beginFunctionBody(begin);
+  this.listener.beginFunctionBody$1(begin);
   token = this.checkEof(this.expect('{', token));
   while (!$notnull_bool(this.optional('}', token))) {
     token = this.parseStatement(token);
     ++statementCount;
   }
-  this.listener.endFunctionBody(statementCount, begin, token);
+  this.listener.endFunctionBody$3(statementCount, begin, token);
   return this.expect('}', token);
 }
 Parser.prototype.parseStatement = function(token) {
@@ -5829,15 +6479,15 @@ Parser.prototype.expectSemicolon = function(token) {
 }
 Parser.prototype.parseReturnStatement = function(token) {
   var begin = token;
-  this.listener.beginReturnStatement(begin);
+  this.listener.beginReturnStatement$1(begin);
   $assert('return' === token.get$stringValue(), "'return' === token.stringValue", "parser.dart", 452, 12);
   token = this.next(token);
   if ($notnull_bool(this.optional(';', token))) {
-    this.listener.endReturnStatement(false, begin, token);
+    this.listener.endReturnStatement$3(false, begin, token);
   }
   else {
     token = this.parseExpression(token);
-    this.listener.endReturnStatement(true, begin, token);
+    this.listener.endReturnStatement$3(true, begin, token);
   }
   return this.expectSemicolon(token);
 }
@@ -5879,9 +6529,9 @@ Parser.prototype.parseLocalDeclaration = function(token, peek1) {
   }
 }
 Parser.prototype.parseExpressionStatement = function(token) {
-  this.listener.beginExpressionStatement(token);
+  this.listener.beginExpressionStatement$1(token);
   token = this.parseExpression(token);
-  this.listener.endExpressionStatement(token);
+  this.listener.endExpressionStatement$1(token);
   return this.expectSemicolon(token);
 }
 Parser.prototype.parseExpression = function(token) {
@@ -5889,7 +6539,7 @@ Parser.prototype.parseExpression = function(token) {
   if ($notnull_bool(this.isAssignmentOperator(token))) {
     var operator = token;
     token = this.parseExpression(this.next(token));
-    this.listener.handleAssignmentExpression(operator);
+    this.listener.handleAssignmentExpression$1(operator);
   }
   return token;
 }
@@ -5904,7 +6554,7 @@ Parser.prototype.parseConditionalExpression = function(token) {
     var colon = token;
     token = this.expect(':', token);
     token = this.parseExpression(token);
-    this.listener.handleConditionalExpression(question, colon);
+    this.listener.handleConditionalExpression$2(question, colon);
   }
   return token;
 }
@@ -5917,7 +6567,7 @@ Parser.prototype.parseBinaryExpression = function(token, precedence) {
     while (tokenLevel === level) {
       var operator = token;
       token = this.parseBinaryExpression(this.next(token), level + 1);
-      this.listener.handleBinaryExpression(operator);
+      this.listener.handleBinaryExpression$1(operator);
       tokenLevel = this.getPrecedence(token);
     }
   }
@@ -6125,7 +6775,7 @@ Parser.prototype.parsePrimary = function(token) {
 
           default:
 
-            this.listener.unexpected(token);
+            this.listener.unexpected$1(token);
             $throw('not yet implemented');
 
         }
@@ -6134,37 +6784,37 @@ Parser.prototype.parsePrimary = function(token) {
 
     default:
 
-      this.listener.unexpected(token);
+      this.listener.unexpected$1(token);
       $throw('not yet implemented');
 
   }
 }
 Parser.prototype.parseLiteralInt = function(token) {
-  this.listener.handleLiteralInt(token);
+  this.listener.handleLiteralInt$1(token);
   return token.next;
 }
 Parser.prototype.parseLiteralDouble = function(token) {
-  this.listener.handleLiteralDouble(token);
+  this.listener.handleLiteralDouble$1(token);
   return token.next;
 }
 Parser.prototype.parseLiteralString = function(token) {
-  this.listener.handleLiteralString(token);
+  this.listener.handleLiteralString$1(token);
   return token.next;
 }
 Parser.prototype.parseLiteralBool = function(token) {
-  this.listener.handleLiteralBool(token);
+  this.listener.handleLiteralBool$1(token);
   return token.next;
 }
 Parser.prototype.parseSend = function(token) {
-  this.listener.beginSend(token);
+  this.listener.beginSend$1(token);
   token = this.parseIdentifier(token);
   token = this.parseArgumentsOpt(token);
-  this.listener.endSend(token);
+  this.listener.endSend$1(token);
   return token;
 }
 Parser.prototype.parseArgumentsOpt = function(token) {
   if (!$notnull_bool(this.optional('(', token))) {
-    this.listener.handleNoArguments(token);
+    this.listener.handleNoArguments$1(token);
     return token;
   }
   else {
@@ -6173,11 +6823,11 @@ Parser.prototype.parseArgumentsOpt = function(token) {
 }
 Parser.prototype.parseArguments = function(token) {
   var begin = token;
-  this.listener.beginArguments(begin);
+  this.listener.beginArguments$1(begin);
   $assert('(' === token.get$stringValue(), "'(' === token.stringValue", "parser.dart", 677, 12);
   var argumentCount = 0;
   if ($notnull_bool(this.optional(')', token.next))) {
-    this.listener.endArguments(argumentCount, begin, token.next);
+    this.listener.endArguments$3(argumentCount, begin, token.next);
     return token.next.next;
   }
   do {
@@ -6185,31 +6835,31 @@ Parser.prototype.parseArguments = function(token) {
     ++argumentCount;
   }
   while ($notnull_bool(this.optional(',', token)))
-  this.listener.endArguments(argumentCount, begin, token);
+  this.listener.endArguments$3(argumentCount, begin, token);
   return this.expect(')', token);
 }
 Parser.prototype.parseVariablesDeclaration = function(token) {
   var count = 1;
-  this.listener.beginVariablesDeclaration(token);
+  this.listener.beginVariablesDeclaration$1(token);
   token = this.parseFinalVarOrType(token);
   token = this.parseOptionallyInitializedIdentifier(token);
   while ($notnull_bool(this.optional(',', token))) {
     token = this.parseOptionallyInitializedIdentifier(this.next(token));
     ++count;
   }
-  this.listener.endVariablesDeclaration(count, token);
+  this.listener.endVariablesDeclaration$2(count, token);
   return this.expectSemicolon(token);
 }
 Parser.prototype.parseOptionallyInitializedIdentifier = function(token) {
-  this.listener.beginInitializedIdentifier(token);
+  this.listener.beginInitializedIdentifier$1(token);
   token = this.parseIdentifier(token);
   if ($notnull_bool(this.optional('=', token))) {
     var assignment = token;
-    this.listener.beginInitializer(token);
+    this.listener.beginInitializer$1(token);
     token = this.parseExpression(this.next(token));
-    this.listener.endInitializer(assignment);
+    this.listener.endInitializer$1(assignment);
   }
-  this.listener.endInitializedIdentifier();
+  this.listener.endInitializedIdentifier$0();
   return token;
 }
 Parser.prototype.parseFinalVarOrType = function(token) {
@@ -6217,7 +6867,7 @@ Parser.prototype.parseFinalVarOrType = function(token) {
   switch (true) {
     case 'final' === value:
 
-      this.listener.handleFinalKeyword(token);
+      this.listener.handleFinalKeyword$1(token);
       return this.next(token);
 
     default:
@@ -6228,7 +6878,7 @@ Parser.prototype.parseFinalVarOrType = function(token) {
 }
 Parser.prototype.parseIfStatement = function(token) {
   var ifToken = token;
-  this.listener.beginIfStatement(ifToken);
+  this.listener.beginIfStatement$1(ifToken);
   token = this.expect('if', token);
   this.expect('(', token);
   token = this.parseArguments(token);
@@ -6238,12 +6888,12 @@ Parser.prototype.parseIfStatement = function(token) {
     elseToken = token;
     token = this.parseStatement(token.next);
   }
-  this.listener.endIfStatement(ifToken, elseToken);
+  this.listener.endIfStatement$2(ifToken, elseToken);
   return token;
 }
 Parser.prototype.parseForStatement = function(token) {
   var forToken = token;
-  this.listener.beginForStatement(forToken);
+  this.listener.beginForStatement$1(forToken);
   token = this.expect('for', token);
   token = this.expect('(', token);
   token = this.parseVariablesDeclaration(token);
@@ -6251,35 +6901,38 @@ Parser.prototype.parseForStatement = function(token) {
   token = this.parseExpression(token);
   token = this.expect(')', token);
   token = this.parseStatement(token);
-  this.listener.endForStatement(forToken, token);
+  this.listener.endForStatement$2(forToken, token);
   return token;
 }
 Parser.prototype.parseBlock = function(token) {
   var begin = token;
-  this.listener.beginBlock(begin);
+  this.listener.beginBlock$1(begin);
   var statementCount = 0;
   token = this.expect('{', token);
   while (!$notnull_bool(this.optional('}', token))) {
     token = this.parseStatement(token);
     ++statementCount;
   }
-  this.listener.endBlock(statementCount, begin, token);
+  this.listener.endBlock$3(statementCount, begin, token);
   return this.expect('}', token);
 }
 Parser.prototype.parseThrowStatement = function(token) {
   var throwToken = token;
-  this.listener.beginThrowStatement(throwToken);
+  this.listener.beginThrowStatement$1(throwToken);
   token = this.expect('throw', token);
   if ($notnull_bool(this.optional(';', token))) {
-    this.listener.endRethrowStatement(throwToken, token);
+    this.listener.endRethrowStatement$2(throwToken, token);
     return token.next;
   }
   else {
     token = this.parseExpression(token);
-    this.listener.endThrowStatement(throwToken, token);
+    this.listener.endThrowStatement$2(throwToken, token);
     return this.expectSemicolon(token);
   }
 }
+Parser.prototype.parseFunction$1 = function($0) {
+  return this.parseFunction(($0 && $0.is$Token()));
+};
 // ********** Code for ParserTask **************
 function ParserTask(compiler) {
   CompilerTask.call(this, compiler);
@@ -6506,30 +7159,213 @@ Listener.prototype.expectedBlock = function(token) {
 Listener.prototype.unexpected = function(token) {
   $throw(new ParserError(("Unexpected token '" + token + "' @ " + token.charOffset + "")));
 }
+Listener.prototype.beginArguments$1 = function($0) {
+  return this.beginArguments(($0 && $0.is$Token()));
+};
+Listener.prototype.beginBlock$1 = function($0) {
+  return this.beginBlock(($0 && $0.is$Token()));
+};
+Listener.prototype.beginClass$1 = function($0) {
+  return this.beginClass(($0 && $0.is$Token()));
+};
+Listener.prototype.beginExpressionStatement$1 = function($0) {
+  return this.beginExpressionStatement(($0 && $0.is$Token()));
+};
+Listener.prototype.beginForStatement$1 = function($0) {
+  return this.beginForStatement(($0 && $0.is$Token()));
+};
+Listener.prototype.beginFormalParameter$1 = function($0) {
+  return this.beginFormalParameter(($0 && $0.is$Token()));
+};
+Listener.prototype.beginFormalParameters$1 = function($0) {
+  return this.beginFormalParameters(($0 && $0.is$Token()));
+};
+Listener.prototype.beginFunction$1 = function($0) {
+  return this.beginFunction(($0 && $0.is$Token()));
+};
+Listener.prototype.beginFunctionBody$1 = function($0) {
+  return this.beginFunctionBody(($0 && $0.is$Token()));
+};
+Listener.prototype.beginFunctionName$1 = function($0) {
+  return this.beginFunctionName(($0 && $0.is$Token()));
+};
+Listener.prototype.beginFunctionTypeAlias$1 = function($0) {
+  return this.beginFunctionTypeAlias(($0 && $0.is$Token()));
+};
+Listener.prototype.beginIfStatement$1 = function($0) {
+  return this.beginIfStatement(($0 && $0.is$Token()));
+};
+Listener.prototype.beginInitializedIdentifier$1 = function($0) {
+  return this.beginInitializedIdentifier(($0 && $0.is$Token()));
+};
+Listener.prototype.beginInitializer$1 = function($0) {
+  return this.beginInitializer(($0 && $0.is$Token()));
+};
+Listener.prototype.beginInterface$1 = function($0) {
+  return this.beginInterface(($0 && $0.is$Token()));
+};
+Listener.prototype.beginLibraryTag$1 = function($0) {
+  return this.beginLibraryTag(($0 && $0.is$Token()));
+};
+Listener.prototype.beginReturnStatement$1 = function($0) {
+  return this.beginReturnStatement(($0 && $0.is$Token()));
+};
+Listener.prototype.beginSend$1 = function($0) {
+  return this.beginSend(($0 && $0.is$Token()));
+};
+Listener.prototype.beginThrowStatement$1 = function($0) {
+  return this.beginThrowStatement(($0 && $0.is$Token()));
+};
+Listener.prototype.beginTopLevelMember$1 = function($0) {
+  return this.beginTopLevelMember(($0 && $0.is$Token()));
+};
 Listener.prototype.beginTypeArguments$1 = function($0) {
   return this.beginTypeArguments(($0 && $0.is$Token()));
-}
-;
+};
+Listener.prototype.beginTypeVariable$1 = function($0) {
+  return this.beginTypeVariable(($0 && $0.is$Token()));
+};
 Listener.prototype.beginTypeVariables$1 = function($0) {
   return this.beginTypeVariables(($0 && $0.is$Token()));
-}
-;
+};
+Listener.prototype.beginVariablesDeclaration$1 = function($0) {
+  return this.beginVariablesDeclaration(($0 && $0.is$Token()));
+};
+Listener.prototype.endArguments$3 = function($0, $1, $2) {
+  return this.endArguments($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
+};
+Listener.prototype.endBlock$3 = function($0, $1, $2) {
+  return this.endBlock($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
+};
+Listener.prototype.endClass$5 = function($0, $1, $2, $3, $4) {
+  return this.endClass($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()), ($3 && $3.is$Token()), ($4 && $4.is$Token()));
+};
+Listener.prototype.endExpressionStatement$1 = function($0) {
+  return this.endExpressionStatement(($0 && $0.is$Token()));
+};
+Listener.prototype.endForStatement$2 = function($0, $1) {
+  return this.endForStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
+};
+Listener.prototype.endFormalParameter$1 = function($0) {
+  return this.endFormalParameter(($0 && $0.is$Token()));
+};
+Listener.prototype.endFormalParameters$3 = function($0, $1, $2) {
+  return this.endFormalParameters($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
+};
+Listener.prototype.endFunctionBody$3 = function($0, $1, $2) {
+  return this.endFunctionBody($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
+};
+Listener.prototype.endFunctionName$1 = function($0) {
+  return this.endFunctionName(($0 && $0.is$Token()));
+};
+Listener.prototype.endFunctionTypeAlias$1 = function($0) {
+  return this.endFunctionTypeAlias(($0 && $0.is$Token()));
+};
+Listener.prototype.endIfStatement$2 = function($0, $1) {
+  return this.endIfStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
+};
+Listener.prototype.endInitializedIdentifier$0 = function() {
+  return this.endInitializedIdentifier();
+};
+Listener.prototype.endInitializer$1 = function($0) {
+  return this.endInitializer(($0 && $0.is$Token()));
+};
+Listener.prototype.endInterface$1 = function($0) {
+  return this.endInterface(($0 && $0.is$Token()));
+};
+Listener.prototype.endRethrowStatement$2 = function($0, $1) {
+  return this.endRethrowStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
+};
+Listener.prototype.endReturnStatement$3 = function($0, $1, $2) {
+  return this.endReturnStatement($assert_bool($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
+};
+Listener.prototype.endSend$1 = function($0) {
+  return this.endSend(($0 && $0.is$Token()));
+};
+Listener.prototype.endThrowStatement$2 = function($0, $1) {
+  return this.endThrowStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
+};
+Listener.prototype.endTopLevelField$2 = function($0, $1) {
+  return this.endTopLevelField(($0 && $0.is$Token()), ($1 && $1.is$Token()));
+};
+Listener.prototype.endTopLevelMethod$2 = function($0, $1) {
+  return this.endTopLevelMethod(($0 && $0.is$Token()), ($1 && $1.is$Token()));
+};
+Listener.prototype.endType$1 = function($0) {
+  return this.endType(($0 && $0.is$Token()));
+};
 Listener.prototype.endTypeArguments$3 = function($0, $1, $2) {
   return this.endTypeArguments($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
-}
-;
+};
+Listener.prototype.endTypeVariable$1 = function($0) {
+  return this.endTypeVariable(($0 && $0.is$Token()));
+};
 Listener.prototype.endTypeVariables$3 = function($0, $1, $2) {
   return this.endTypeVariables($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
-}
-;
+};
+Listener.prototype.endVariablesDeclaration$2 = function($0, $1) {
+  return this.endVariablesDeclaration($assert_num($0), ($1 && $1.is$Token()));
+};
+Listener.prototype.expected$2 = function($0, $1) {
+  return this.expected($assert_String($0), ($1 && $1.is$Token()));
+};
+Listener.prototype.expectedBlock$1 = function($0) {
+  return this.expectedBlock(($0 && $0.is$Token()));
+};
+Listener.prototype.expectedIdentifier$1 = function($0) {
+  return this.expectedIdentifier(($0 && $0.is$Token()));
+};
+Listener.prototype.expectedType$1 = function($0) {
+  return this.expectedType(($0 && $0.is$Token()));
+};
+Listener.prototype.handleAssignmentExpression$1 = function($0) {
+  return this.handleAssignmentExpression(($0 && $0.is$Token()));
+};
+Listener.prototype.handleBinaryExpression$1 = function($0) {
+  return this.handleBinaryExpression(($0 && $0.is$Token()));
+};
+Listener.prototype.handleConditionalExpression$2 = function($0, $1) {
+  return this.handleConditionalExpression(($0 && $0.is$Token()), ($1 && $1.is$Token()));
+};
+Listener.prototype.handleIdentifier$1 = function($0) {
+  return this.handleIdentifier(($0 && $0.is$Token()));
+};
+Listener.prototype.handleLiteralBool$1 = function($0) {
+  return this.handleLiteralBool(($0 && $0.is$Token()));
+};
+Listener.prototype.handleLiteralDouble$1 = function($0) {
+  return this.handleLiteralDouble(($0 && $0.is$Token()));
+};
+Listener.prototype.handleLiteralInt$1 = function($0) {
+  return this.handleLiteralInt(($0 && $0.is$Token()));
+};
+Listener.prototype.handleLiteralString$1 = function($0) {
+  return this.handleLiteralString(($0 && $0.is$Token()));
+};
+Listener.prototype.handleNoArguments$1 = function($0) {
+  return this.handleNoArguments(($0 && $0.is$Token()));
+};
+Listener.prototype.handleNoType$1 = function($0) {
+  return this.handleNoType(($0 && $0.is$Token()));
+};
 Listener.prototype.handleNoTypeArguments$1 = function($0) {
   return this.handleNoTypeArguments(($0 && $0.is$Token()));
-}
-;
+};
 Listener.prototype.handleNoTypeVariables$1 = function($0) {
   return this.handleNoTypeVariables(($0 && $0.is$Token()));
-}
-;
+};
+Listener.prototype.handleVarKeyword$1 = function($0) {
+  return this.handleVarKeyword(($0 && $0.is$Token()));
+};
+Listener.prototype.handleVoidKeyword$1 = function($0) {
+  return this.handleVoidKeyword(($0 && $0.is$Token()));
+};
+Listener.prototype.unexpected$1 = function($0) {
+  return this.unexpected(($0 && $0.is$Token()));
+};
+Listener.prototype.unexpectedEof$0 = function() {
+  return this.unexpectedEof();
+};
 // ********** Code for ParserError **************
 function ParserError(reason) {
   this.reason = reason;
@@ -6538,11 +7374,14 @@ function ParserError(reason) {
 ParserError.prototype.toString = function() {
   return this.reason;
 }
+ParserError.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for ElementListener **************
 function ElementListener(canceler) {
   this.previousIdentifier = null
-  this.nodes = const$16/*const EmptyLink()*/
-  this.topLevelElements = const$16/*const EmptyLink()*/
+  this.nodes = const$18/*const EmptyLink()*/
+  this.topLevelElements = const$18/*const EmptyLink()*/
   this.canceler = canceler;
   // Initializers done
 }
@@ -6627,10 +7466,54 @@ ElementListener.prototype.popNode = function() {
 ElementListener.prototype.log = function(message) {
 
 }
+ElementListener.prototype.beginLibraryTag$1 = function($0) {
+  return this.beginLibraryTag(($0 && $0.is$Token()));
+};
+ElementListener.prototype.endClass$5 = function($0, $1, $2, $3, $4) {
+  return this.endClass($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()), ($3 && $3.is$Token()), ($4 && $4.is$Token()));
+};
+ElementListener.prototype.endFunctionTypeAlias$1 = function($0) {
+  return this.endFunctionTypeAlias(($0 && $0.is$Token()));
+};
+ElementListener.prototype.endInterface$1 = function($0) {
+  return this.endInterface(($0 && $0.is$Token()));
+};
+ElementListener.prototype.endTopLevelField$2 = function($0, $1) {
+  return this.endTopLevelField(($0 && $0.is$Token()), ($1 && $1.is$Token()));
+};
+ElementListener.prototype.endTopLevelMethod$2 = function($0, $1) {
+  return this.endTopLevelMethod(($0 && $0.is$Token()), ($1 && $1.is$Token()));
+};
 ElementListener.prototype.endTypeArguments$3 = function($0, $1, $2) {
   return this.endTypeArguments($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
-}
-;
+};
+ElementListener.prototype.endTypeVariable$1 = function($0) {
+  return this.endTypeVariable(($0 && $0.is$Token()));
+};
+ElementListener.prototype.expected$2 = function($0, $1) {
+  return this.expected($assert_String($0), ($1 && $1.is$Token()));
+};
+ElementListener.prototype.expectedBlock$1 = function($0) {
+  return this.expectedBlock(($0 && $0.is$Token()));
+};
+ElementListener.prototype.expectedIdentifier$1 = function($0) {
+  return this.expectedIdentifier(($0 && $0.is$Token()));
+};
+ElementListener.prototype.expectedType$1 = function($0) {
+  return this.expectedType(($0 && $0.is$Token()));
+};
+ElementListener.prototype.handleIdentifier$1 = function($0) {
+  return this.handleIdentifier(($0 && $0.is$Token()));
+};
+ElementListener.prototype.handleNoType$1 = function($0) {
+  return this.handleNoType(($0 && $0.is$Token()));
+};
+ElementListener.prototype.unexpected$1 = function($0) {
+  return this.unexpected(($0 && $0.is$Token()));
+};
+ElementListener.prototype.unexpectedEof$0 = function() {
+  return this.unexpectedEof();
+};
 // ********** Code for NodeListener **************
 function NodeListener(canceler, logger) {
   this.logger = logger;
@@ -6774,7 +7657,7 @@ NodeListener.prototype.endRethrowStatement = function(throwToken, endToken) {
 }
 NodeListener.prototype.makeNodeList = function(count, beginToken, endToken, delimiter) {
   var $0;
-  var nodes = const$16/*const EmptyLink()*/;
+  var nodes = const$18/*const EmptyLink()*/;
   for (; count > 0; --count) {
     nodes = (($0 = nodes.prepend(this.popNode())) && $0.is$Link$Node());
   }
@@ -6784,6 +7667,87 @@ NodeListener.prototype.makeNodeList = function(count, beginToken, endToken, deli
 NodeListener.prototype.log = function(message) {
   this.logger.log(message);
 }
+NodeListener.prototype.endArguments$3 = function($0, $1, $2) {
+  return this.endArguments($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
+};
+NodeListener.prototype.endBlock$3 = function($0, $1, $2) {
+  return this.endBlock($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
+};
+NodeListener.prototype.endClass$5 = function($0, $1, $2, $3, $4) {
+  return this.endClass($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()), ($3 && $3.is$Token()), ($4 && $4.is$Token()));
+};
+NodeListener.prototype.endExpressionStatement$1 = function($0) {
+  return this.endExpressionStatement(($0 && $0.is$Token()));
+};
+NodeListener.prototype.endForStatement$2 = function($0, $1) {
+  return this.endForStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
+};
+NodeListener.prototype.endFormalParameter$1 = function($0) {
+  return this.endFormalParameter(($0 && $0.is$Token()));
+};
+NodeListener.prototype.endFormalParameters$3 = function($0, $1, $2) {
+  return this.endFormalParameters($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
+};
+NodeListener.prototype.endFunctionBody$3 = function($0, $1, $2) {
+  return this.endFunctionBody($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
+};
+NodeListener.prototype.endIfStatement$2 = function($0, $1) {
+  return this.endIfStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
+};
+NodeListener.prototype.endInitializer$1 = function($0) {
+  return this.endInitializer(($0 && $0.is$Token()));
+};
+NodeListener.prototype.endRethrowStatement$2 = function($0, $1) {
+  return this.endRethrowStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
+};
+NodeListener.prototype.endReturnStatement$3 = function($0, $1, $2) {
+  return this.endReturnStatement($assert_bool($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
+};
+NodeListener.prototype.endSend$1 = function($0) {
+  return this.endSend(($0 && $0.is$Token()));
+};
+NodeListener.prototype.endThrowStatement$2 = function($0, $1) {
+  return this.endThrowStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
+};
+NodeListener.prototype.endType$1 = function($0) {
+  return this.endType(($0 && $0.is$Token()));
+};
+NodeListener.prototype.endVariablesDeclaration$2 = function($0, $1) {
+  return this.endVariablesDeclaration($assert_num($0), ($1 && $1.is$Token()));
+};
+NodeListener.prototype.handleAssignmentExpression$1 = function($0) {
+  return this.handleAssignmentExpression(($0 && $0.is$Token()));
+};
+NodeListener.prototype.handleBinaryExpression$1 = function($0) {
+  return this.handleBinaryExpression(($0 && $0.is$Token()));
+};
+NodeListener.prototype.handleConditionalExpression$2 = function($0, $1) {
+  return this.handleConditionalExpression(($0 && $0.is$Token()), ($1 && $1.is$Token()));
+};
+NodeListener.prototype.handleFinalKeyword$1 = function($0) {
+  return this.handleFinalKeyword(($0 && $0.is$Token()));
+};
+NodeListener.prototype.handleLiteralBool$1 = function($0) {
+  return this.handleLiteralBool(($0 && $0.is$Token()));
+};
+NodeListener.prototype.handleLiteralDouble$1 = function($0) {
+  return this.handleLiteralDouble(($0 && $0.is$Token()));
+};
+NodeListener.prototype.handleLiteralInt$1 = function($0) {
+  return this.handleLiteralInt(($0 && $0.is$Token()));
+};
+NodeListener.prototype.handleLiteralString$1 = function($0) {
+  return this.handleLiteralString(($0 && $0.is$Token()));
+};
+NodeListener.prototype.handleNoArguments$1 = function($0) {
+  return this.handleNoArguments(($0 && $0.is$Token()));
+};
+NodeListener.prototype.handleVarKeyword$1 = function($0) {
+  return this.handleVarKeyword(($0 && $0.is$Token()));
+};
+NodeListener.prototype.handleVoidKeyword$1 = function($0) {
+  return this.handleVoidKeyword(($0 && $0.is$Token()));
+};
 // ********** Code for PartialFunctionElement **************
 function PartialFunctionElement(name, beginToken, endToken) {
   this.beginToken = beginToken;
@@ -6797,7 +7761,7 @@ PartialFunctionElement.prototype.parseNode = function(canceler, logger) {
   var $0;
   if (this.node != null) return this.node;
   this.node = (($0 = parse(canceler, logger, (function (p) {
-    return p.parseFunction($this.beginToken);
+    return p.parseFunction$1($this.beginToken);
   })
   )) && $0.is$FunctionExpression());
   return this.node;
@@ -6815,7 +7779,7 @@ PartialClassElement.prototype.parseNode = function(canceler, logger) {
   var $0;
   if (this.node != null) return this.node;
   this.node = (($0 = parse(canceler, logger, (function (p) {
-    return p.parseClass($this.beginToken);
+    return p.parseClass$1($this.beginToken);
   })
   )) && $0.is$ClassNode());
   return this.node;
@@ -6858,7 +7822,7 @@ SubstringWrapper.prototype.hashCode = function() {
   return this.toString().hashCode();
 }
 SubstringWrapper.prototype.$eq = function(other) {
-  return !!(other && other.is$SourceString) && this.toString() == other.toString();
+  return !!(other && other.is$SourceString) && this.toString() == other.toString$0();
 }
 SubstringWrapper.prototype.printOn = function(sb) {
   sb.add(this);
@@ -6869,6 +7833,15 @@ SubstringWrapper.prototype.toString = function() {
 SubstringWrapper.prototype.get$stringValue = function() {
   return null;
 }
+SubstringWrapper.prototype.hashCode$0 = function() {
+  return this.hashCode();
+};
+SubstringWrapper.prototype.printOn$1 = function($0) {
+  return this.printOn(($0 && $0.is$StringBuffer()));
+};
+SubstringWrapper.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for Token **************
 function Token(kind, charOffset) {
   this.kind = kind;
@@ -6878,7 +7851,7 @@ function Token(kind, charOffset) {
 Token.prototype.is$Token = function(){return this;};
 Token.prototype.get$charOffset = function() { return this.charOffset; };
 Token.prototype.get$value = function() {
-  return const$236/*const SourceString('EOF')*/;
+  return const$238/*const SourceString('EOF')*/;
 }
 Token.prototype.get$stringValue = function() {
   return 'EOF';
@@ -6886,6 +7859,12 @@ Token.prototype.get$stringValue = function() {
 Token.prototype.toString = function() {
   return Strings.String$fromCharCodes$factory([this.kind]);
 }
+Token.prototype.next$0 = function() {
+  return this.next();
+};
+Token.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for KeywordToken **************
 function KeywordToken(value, charOffset) {
   this.value = value;
@@ -6900,6 +7879,9 @@ KeywordToken.prototype.get$stringValue = function() {
 KeywordToken.prototype.toString = function() {
   return this.value.syntax;
 }
+KeywordToken.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for StringToken **************
 function StringToken(kind, value, charOffset) {
   StringToken.fromSource$ctor.call(this, kind, new StringWrapper(value), charOffset);
@@ -6919,6 +7901,9 @@ StringToken.prototype.get$stringValue = function() {
 StringToken.prototype.toString = function() {
   return this.value.toString();
 }
+StringToken.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for StringWrapper **************
 function StringWrapper(internalString) {
   this.internalString = internalString;
@@ -6929,7 +7914,7 @@ StringWrapper.prototype.hashCode = function() {
   return this.toString().hashCode();
 }
 StringWrapper.prototype.$eq = function(other) {
-  return !!(other && other.is$SourceString) && this.toString() == other.toString();
+  return !!(other && other.is$SourceString) && this.toString() == other.toString$0();
 }
 StringWrapper.prototype.printOn = function(sb) {
   sb.add(this.internalString);
@@ -6940,6 +7925,15 @@ StringWrapper.prototype.toString = function() {
 StringWrapper.prototype.get$stringValue = function() {
   return this.internalString;
 }
+StringWrapper.prototype.hashCode$0 = function() {
+  return this.hashCode();
+};
+StringWrapper.prototype.printOn$1 = function($0) {
+  return this.printOn(($0 && $0.is$StringBuffer()));
+};
+StringWrapper.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for BeginGroupToken **************
 function BeginGroupToken(kind, value, charOffset) {
   StringToken.call(this, kind, value, charOffset);
@@ -6962,7 +7956,7 @@ Keyword.get$keywords = function() {
 }
 Keyword.computeKeywordMap = function() {
   var result = new LinkedHashMapImplementation$String$Keyword();
-  for (var $i0 = const$234/*Keyword.values*/.iterator(); $i0.hasNext(); ) {
+  for (var $i0 = const$236/*Keyword.values*/.iterator(); $i0.hasNext(); ) {
     var keyword = $i0.next();
     result.$setindex(keyword.syntax, keyword);
   }
@@ -6972,7 +7966,7 @@ Keyword.prototype.hashCode = function() {
   return this.syntax.hashCode();
 }
 Keyword.prototype.$eq = function(other) {
-  return !!(other && other.is$SourceString) && this.toString() == other.toString();
+  return !!(other && other.is$SourceString) && this.toString() == other.toString$0();
 }
 Keyword.prototype.printOn = function(sb) {
   sb.add(this.syntax);
@@ -6983,18 +7977,27 @@ Keyword.prototype.toString = function() {
 Keyword.prototype.get$stringValue = function() {
   return this.syntax;
 }
+Keyword.prototype.hashCode$0 = function() {
+  return this.hashCode();
+};
+Keyword.prototype.printOn$1 = function($0) {
+  return this.printOn(($0 && $0.is$StringBuffer()));
+};
+Keyword.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for KeywordState **************
 function KeywordState() {}
 KeywordState.prototype.is$KeywordState = function(){return this;};
 KeywordState.get$KEYWORD_STATE = function() {
   if (KeywordState._KEYWORD_STATE == null) {
-    var strings = new ListFactory$String(const$234/*Keyword.values*/.get$length());
+    var strings = new ListFactory$String(const$236/*Keyword.values*/.get$length());
     for (var i = 0;
-     i < const$234/*Keyword.values*/.get$length(); i++) {
-      strings.$setindex(i, const$234/*Keyword.values*/[i].syntax);
+     i < const$236/*Keyword.values*/.get$length(); i++) {
+      strings.$setindex(i, const$236/*Keyword.values*/[i].syntax);
     }
     strings.sort((function (a, b) {
-      return a.compareTo(b);
+      return a.compareTo$1(b);
     })
     );
     KeywordState._KEYWORD_STATE = KeywordState.computeKeywordStateTable(0, strings, 0, strings.length);
@@ -7009,7 +8012,7 @@ KeywordState.computeKeywordStateTable = function(start, strings, offset, length)
   for (var i = offset;
    i < offset + length; i++) {
     if (strings.$index(i).length > start) {
-      var c = strings.$index(i).charCodeAt(start);
+      var c = strings.$index(i).charCodeAt$1(start);
       if (chunk != c) {
         if (chunkStart != -1) {
           result.$setindex(chunk - 97/*null.$a*/, KeywordState.computeKeywordStateTable(start + 1, strings, chunkStart, i - chunkStart));
@@ -7057,6 +8060,9 @@ ArrayKeywordState.prototype.toString = function() {
   sb.add("]");
   return sb.toString();
 }
+ArrayKeywordState.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for LeafKeywordState **************
 function LeafKeywordState(syntax) {
   this.keyword = Keyword.get$keywords().$index(syntax);
@@ -7074,6 +8080,9 @@ LeafKeywordState.prototype.next = function(c) {
 LeafKeywordState.prototype.toString = function() {
   return this.keyword.syntax;
 }
+LeafKeywordState.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for top level **************
 function parse(canceler, logger, doParse) {
   var listener = new NodeListener(canceler, logger);
@@ -7104,6 +8113,21 @@ Node.prototype.unparse = function() {
     return ('<<unparse error: ' + this.getObjectDescription() + ': ' + unparser.sb + '>>');
   }
 }
+Node.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
+Node.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+Node.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
+Node.prototype.hashCode$0 = function() {
+  return this.hashCode();
+};
+Node.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for ClassNode **************
 function ClassNode(name, superclass, interfaces, beginToken, extendsKeyword, endToken) {
   this.name = name;
@@ -7133,6 +8157,15 @@ ClassNode.prototype.getBeginToken = function() {
 ClassNode.prototype.getEndToken = function() {
   return this.endToken;
 }
+ClassNode.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
+ClassNode.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+ClassNode.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
 // ********** Code for Expression **************
 function Expression() {}
 $inherits(Expression, Node);
@@ -7156,6 +8189,9 @@ Send.prototype.get$arguments = function() {
 Send.prototype.accept = function(visitor) {
   return visitor.visitSend(this);
 }
+Send.prototype.get$isOperator = function() {
+  return (this.selector instanceof Operator);
+}
 Send.prototype.get$isPropertyAccess = function() {
   return this.argumentsNode == null;
 }
@@ -7175,6 +8211,15 @@ Send.prototype.getEndToken = function() {
   }
   return (($0 = this.receiver.getBeginToken()) && $0.is$Token());
 }
+Send.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
+Send.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+Send.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
 // ********** Code for SendSet **************
 function SendSet(receiver, selector, assignmentOperator, argumentsNode) {
   this.assignmentOperator = assignmentOperator;
@@ -7186,6 +8231,9 @@ SendSet.prototype.is$SendSet = function(){return this;};
 SendSet.prototype.accept = function(visitor) {
   return visitor.visitSendSet(this);
 }
+SendSet.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
 // ********** Code for NodeList **************
 function NodeList(beginToken, nodes, endToken, delimiter) {
   this.beginToken = beginToken;
@@ -7210,11 +8258,11 @@ NodeList.prototype.getBeginToken = function() {
   if (this.nodes != null) {
     for (var link = this.nodes;
      !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
-      if (link.get$head().getBeginToken() != null) {
-        return (($0 = link.get$head().getBeginToken()) && $0.is$Token());
+      if (link.get$head().getBeginToken$0() != null) {
+        return (($0 = link.get$head().getBeginToken$0()) && $0.is$Token());
       }
-      if (link.get$head().getEndToken() != null) {
-        return (($0 = link.get$head().getEndToken()) && $0.is$Token());
+      if (link.get$head().getEndToken$0() != null) {
+        return (($0 = link.get$head().getEndToken$0()) && $0.is$Token());
       }
     }
   }
@@ -7225,12 +8273,21 @@ NodeList.prototype.getEndToken = function() {
   if (this.endToken != null) return this.endToken;
   if (this.nodes != null) {
     var link = this.nodes;
-    while (!$notnull_bool(link.get$tail().isEmpty())) link = (($0 = link.get$tail()) && $0.is$Link$Node());
-    if (link.get$head().getEndToken() != null) return (($0 = link.get$head().getEndToken()) && $0.is$Token());
-    if (link.get$head().getBeginToken() != null) return (($0 = link.get$head().getBeginToken()) && $0.is$Token());
+    while (!$notnull_bool(link.get$tail().isEmpty$0())) link = (($0 = link.get$tail()) && $0.is$Link$Node());
+    if (link.get$head().getEndToken$0() != null) return (($0 = link.get$head().getEndToken$0()) && $0.is$Token());
+    if (link.get$head().getBeginToken$0() != null) return (($0 = link.get$head().getBeginToken$0()) && $0.is$Token());
   }
   return this.beginToken;
 }
+NodeList.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
+NodeList.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+NodeList.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
 // ********** Code for Block **************
 function Block(statements) {
   this.statements = statements;
@@ -7246,6 +8303,15 @@ Block.prototype.getBeginToken = function() {
 Block.prototype.getEndToken = function() {
   return this.statements.getEndToken();
 }
+Block.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
+Block.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+Block.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
 // ********** Code for If **************
 function If(condition, thenPart, elsePart, ifToken, elseToken) {
   this.condition = condition;
@@ -7269,6 +8335,15 @@ If.prototype.getEndToken = function() {
   if (this.elsePart == null) return this.thenPart.getEndToken();
   return this.elsePart.getEndToken();
 }
+If.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
+If.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+If.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
 // ********** Code for For **************
 function For(initializer, condition, update, body, forToken) {
   this.initializer = initializer;
@@ -7288,6 +8363,15 @@ For.prototype.getBeginToken = function() {
 For.prototype.getEndToken = function() {
   return this.body.getEndToken();
 }
+For.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
+For.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+For.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
 // ********** Code for FunctionExpression **************
 function FunctionExpression(name, parameters, body, returnType) {
   this.name = name;
@@ -7310,6 +8394,15 @@ FunctionExpression.prototype.getBeginToken = function() {
 FunctionExpression.prototype.getEndToken = function() {
   return this.body.getEndToken();
 }
+FunctionExpression.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
+FunctionExpression.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+FunctionExpression.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
 // ********** Code for Literal **************
 function Literal(token, handler) {
   this.token = token;
@@ -7323,6 +8416,12 @@ Literal.prototype.getBeginToken = function() {
 Literal.prototype.getEndToken = function() {
   return this.token;
 }
+Literal.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+Literal.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
 // ********** Code for Literal$SourceString **************
 function Literal$SourceString(token, handler) {
   this.token = token;
@@ -7359,7 +8458,7 @@ function LiteralInt(token, handler) {
 $inherits(LiteralInt, Literal$int);
 LiteralInt.prototype.get$value = function() {
   try {
-    return Math.parseInt($assert_String(this.token.get$value().toString()));
+    return Math.parseInt(this.token.get$value().toString$0());
   } catch (ex) {
     ex = $toDartException(ex);
     if (!(ex instanceof BadNumberFormatException)) throw ex;
@@ -7369,6 +8468,9 @@ LiteralInt.prototype.get$value = function() {
 LiteralInt.prototype.accept = function(visitor) {
   return visitor.visitLiteralInt(this);
 }
+LiteralInt.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
 // ********** Code for LiteralDouble **************
 function LiteralDouble(token, handler) {
   Literal$double.call(this, token, handler);
@@ -7377,7 +8479,7 @@ function LiteralDouble(token, handler) {
 $inherits(LiteralDouble, Literal$double);
 LiteralDouble.prototype.get$value = function() {
   try {
-    return Math.parseDouble($assert_String(this.token.get$value().toString()));
+    return Math.parseDouble(this.token.get$value().toString$0());
   } catch (ex) {
     ex = $toDartException(ex);
     if (!(ex instanceof BadNumberFormatException)) throw ex;
@@ -7387,6 +8489,9 @@ LiteralDouble.prototype.get$value = function() {
 LiteralDouble.prototype.accept = function(visitor) {
   return visitor.visitLiteralDouble(this);
 }
+LiteralDouble.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
 // ********** Code for LiteralBool **************
 function LiteralBool(token, handler) {
   Literal$bool.call(this, token, handler);
@@ -7395,11 +8500,11 @@ function LiteralBool(token, handler) {
 $inherits(LiteralBool, Literal$bool);
 LiteralBool.prototype.get$value = function() {
   switch (this.token.get$value()) {
-    case const$190/*Keyword.TRUE*/:
+    case const$192/*Keyword.TRUE*/:
 
       return true;
 
-    case const$162/*Keyword.FALSE*/:
+    case const$164/*Keyword.FALSE*/:
 
       return false;
 
@@ -7412,6 +8517,9 @@ LiteralBool.prototype.get$value = function() {
 LiteralBool.prototype.accept = function(visitor) {
   return visitor.visitLiteralBool(this);
 }
+LiteralBool.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
 // ********** Code for LiteralString **************
 function LiteralString(token) {
   Literal$SourceString.call(this, token, to$call$2(null));
@@ -7426,6 +8534,9 @@ LiteralString.prototype.get$value = function() {
 LiteralString.prototype.accept = function(visitor) {
   return visitor.visitLiteralString(this);
 }
+LiteralString.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
 // ********** Code for Identifier **************
 function Identifier(token) {
   this.token = token;
@@ -7446,6 +8557,15 @@ Identifier.prototype.getBeginToken = function() {
 Identifier.prototype.getEndToken = function() {
   return this.token;
 }
+Identifier.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
+Identifier.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+Identifier.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
 // ********** Code for Operator **************
 function Operator(token) {
   Identifier.call(this, token);
@@ -7456,6 +8576,9 @@ Operator.prototype.is$Operator = function(){return this;};
 Operator.prototype.accept = function(visitor) {
   return visitor.visitOperator(this);
 }
+Operator.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
 // ********** Code for Return **************
 function Return(beginToken, endToken, expression) {
   this.beginToken = beginToken;
@@ -7476,6 +8599,15 @@ Return.prototype.getBeginToken = function() {
 Return.prototype.getEndToken = function() {
   return this.endToken;
 }
+Return.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
+Return.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+Return.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
 // ********** Code for ExpressionStatement **************
 function ExpressionStatement(expression, endToken) {
   this.expression = expression;
@@ -7494,6 +8626,15 @@ ExpressionStatement.prototype.getBeginToken = function() {
 ExpressionStatement.prototype.getEndToken = function() {
   return this.endToken;
 }
+ExpressionStatement.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
+ExpressionStatement.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+ExpressionStatement.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
 // ********** Code for Throw **************
 function Throw(expression, throwToken, endToken) {
   this.expression = expression;
@@ -7511,6 +8652,15 @@ Throw.prototype.getBeginToken = function() {
 Throw.prototype.getEndToken = function() {
   return this.endToken;
 }
+Throw.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
+Throw.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+Throw.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
 // ********** Code for TypeAnnotation **************
 function TypeAnnotation(typeName) {
   this.typeName = typeName;
@@ -7530,6 +8680,15 @@ TypeAnnotation.prototype.getEndToken = function() {
   var $0;
   return (($0 = this.typeName.getEndToken()) && $0.is$Token());
 }
+TypeAnnotation.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
+TypeAnnotation.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+TypeAnnotation.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
 // ********** Code for VariableDefinitions **************
 function VariableDefinitions(type, modifiers, definitions, endToken) {
   this.type = type;
@@ -7549,11 +8708,21 @@ VariableDefinitions.prototype.getBeginToken = function() {
 VariableDefinitions.prototype.getEndToken = function() {
   return this.endToken;
 }
+VariableDefinitions.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$Visitor()));
+};
+VariableDefinitions.prototype.getBeginToken$0 = function() {
+  return this.getBeginToken();
+};
+VariableDefinitions.prototype.getEndToken$0 = function() {
+  return this.getEndToken();
+};
 // ********** Code for Unparser **************
 function Unparser(printDebugInfo) {
   this.printDebugInfo = printDebugInfo;
   // Initializers done
 }
+Unparser.prototype.is$Visitor = function(){return this;};
 Unparser.prototype.unparse = function(node) {
   this.sb = new StringBufferImpl("");
   this.visit(node);
@@ -7581,7 +8750,7 @@ Unparser.prototype.visitExpressionStatement = function(node) {
   this.add((($0 = node.endToken.get$value()) && $0.is$SourceString()));
 }
 Unparser.prototype.visitFor = function(node) {
-  node.forToken.get$value().printOn(this.sb);
+  node.forToken.get$value().printOn$1(this.sb);
   this.sb.add('(');
   this.visit(node.initializer);
   this.visit(node.condition);
@@ -7667,11 +8836,11 @@ Unparser.prototype.visitSendSet = function(node) {
   this.visit(node.argumentsNode);
 }
 Unparser.prototype.visitThrow = function(node) {
-  node.throwToken.get$value().printOn(this.sb);
+  node.throwToken.get$value().printOn$1(this.sb);
   if (node.expression != null) {
     this.visit(node.expression);
   }
-  node.endToken.get$value().printOn(this.sb);
+  node.endToken.get$value().printOn$1(this.sb);
 }
 Unparser.prototype.visitTypeAnnotation = function(node) {
   this.visit(node.typeName);
@@ -7688,6 +8857,12 @@ Unparser.prototype.visitVariableDefinitions = function(node) {
   this.visit(node.definitions);
   if (node.endToken != null) this.add((($0 = node.endToken.get$value()) && $0.is$SourceString()));
 }
+Unparser.prototype.add$1 = function($0) {
+  return this.add(($0 && $0.is$SourceString()));
+};
+Unparser.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$Node()));
+};
 // ********** Code for top level **************
 function firstBeginToken(first, second) {
   var $0;
@@ -7711,11 +8886,17 @@ Element.prototype.get$name = function() { return this.name; };
 Element.prototype.hashCode = function() {
   return this.name.hashCode();
 }
+Element.prototype.computeType$2 = function($0, $1) {
+  return this.computeType(($0 && $0.is$Compiler()), ($1 && $1.is$Types()));
+};
+Element.prototype.hashCode$0 = function() {
+  return this.hashCode();
+};
 // ********** Code for VariableElement **************
 function VariableElement(node, typeAnnotation, name, enclosingElement) {
   this.node = node;
   this.typeAnnotation = typeAnnotation;
-  Element.call(this, name, const$255, enclosingElement);
+  Element.call(this, name, const$257, enclosingElement);
   // Initializers done
 }
 $inherits(VariableElement, Element);
@@ -7725,18 +8906,24 @@ VariableElement.prototype.parseNode = function(canceler, logger) {
 VariableElement.prototype.computeType = function(compiler, types) {
   return getType(this.typeAnnotation, types);
 }
+VariableElement.prototype.computeType$2 = function($0, $1) {
+  return this.computeType(($0 && $0.is$Compiler()), ($1 && $1.is$Types()));
+};
 // ********** Code for ForeignElement **************
 function ForeignElement(name) {
-  Element.call(this, name, const$244, null);
+  Element.call(this, name, const$246, null);
   // Initializers done
 }
 $inherits(ForeignElement, Element);
 ForeignElement.prototype.computeType = function(compiler, types) {
   return types.dynamicType;
 }
+ForeignElement.prototype.computeType$2 = function($0, $1) {
+  return this.computeType(($0 && $0.is$Compiler()), ($1 && $1.is$Types()));
+};
 // ********** Code for FunctionElement **************
 function FunctionElement(name) {
-  Element.call(this, name, const$241, null);
+  Element.call(this, name, const$243, null);
   // Initializers done
 }
 $inherits(FunctionElement, Element);
@@ -7748,29 +8935,31 @@ FunctionElement.prototype.computeType = function(compiler, types) {
   if (returnType == null) compiler.cancel(('unknown type ' + returnType + ''));
   var parameterTypes = new LinkBuilderImplementation$Type();
   for (var link = node.parameters.nodes;
-   !$notnull_bool(link.isEmpty()); link = link.get$tail()) {
+   !$notnull_bool(link.isEmpty$0()); link = link.get$tail()) {
     var parameter = (($0 = link.get$head()) && $0.is$VariableDefinitions());
     parameterTypes.addLast(getType(parameter.type, types));
   }
   this.type = new FunctionType(returnType, (($0 = parameterTypes.toLink()) && $0.is$Link$Type()));
   return (($0 = this.type) && $0.is$FunctionType());
 }
+FunctionElement.prototype.computeType$2 = FunctionElement.prototype.computeType;
 // ********** Code for ClassElement **************
 function ClassElement(name) {
-  Element.call(this, name, const$239, null);
+  Element.call(this, name, const$241, null);
   // Initializers done
 }
 $inherits(ClassElement, Element);
 ClassElement.prototype.computeType = function(compiler, types) {
-  compiler.unimplemented('ClassElement.computeType');
+  compiler.unimplemented$1('ClassElement.computeType');
 }
+ClassElement.prototype.computeType$2 = ClassElement.prototype.computeType;
 // ********** Code for top level **************
 function getType(annotation, types) {
   var $0;
   if (annotation == null || annotation.typeName == null) {
     return (($0 = types.dynamicType) && $0.is$Type());
   }
-  return (($0 = types.lookup(annotation.typeName.get$source())) && $0.is$Type());
+  return (($0 = types.lookup$1(annotation.typeName.get$source())) && $0.is$Type());
 }
 //  ********** Library ssa **************
 // ********** Code for SsaBuilderTask **************
@@ -7810,6 +8999,7 @@ function SsaBuilder(compiler, elements) {
   this.elements = elements;
   // Initializers done
 }
+SsaBuilder.prototype.is$Visitor = function(){return this;};
 SsaBuilder.prototype.build = function(parameters, body) {
   this.stack = new ListFactory$HInstruction();
   this.definitions = new HashMapImplementation$Element$HInstruction();
@@ -7862,7 +9052,7 @@ SsaBuilder.prototype.visitParameters = function(parameters) {
    !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
     var container = (($0 = link.get$head()) && $0.is$VariableDefinitions());
     var identifierLink = container.definitions.nodes;
-    $assert($notnull_bool(!$notnull_bool(identifierLink.isEmpty()) && identifierLink.get$tail().isEmpty()), "!identifierLink.isEmpty() && identifierLink.tail.isEmpty()", "builder.dart", 115, 14);
+    $assert($notnull_bool(!$notnull_bool(identifierLink.isEmpty()) && identifierLink.get$tail().isEmpty$0()), "!identifierLink.isEmpty() && identifierLink.tail.isEmpty()", "builder.dart", 115, 14);
     if (!(identifierLink.get$head() instanceof Identifier)) {
       this.compiler.unimplemented("SsaBuilder.visitParameters non-identifier");
     }
@@ -8078,15 +9268,15 @@ SsaBuilder.prototype.visitSend = function(node) {
   }
   else {
     var link = node.get$arguments();
-    if (this.elements.$index(node).kind === const$244/*ElementKind.FOREIGN*/) {
+    if (this.elements.$index(node).kind === const$246/*ElementKind.FOREIGN*/) {
       link = (($0 = link.get$tail()) && $0.is$Link$Node());
     }
     var arguments = [];
     for (; !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
       this.visit((($0 = link.get$head()) && $0.is$Node()));
-      arguments.add(this.pop());
+      arguments.add$1(this.pop());
     }
-    if (this.elements.$index(node).kind === const$244/*ElementKind.FOREIGN*/) {
+    if (this.elements.$index(node).kind === const$246/*ElementKind.FOREIGN*/) {
       var literal = (($0 = node.get$arguments().get$head()) && $0.is$LiteralString());
       this.compiler.ensure((literal instanceof LiteralString));
       this.push(new HInvokeForeign(this.unquote(literal), arguments));
@@ -8146,7 +9336,7 @@ SsaBuilder.prototype.updateDefinition = function(node) {
     this.compiler.unimplemented("SsaBuilder: property access");
   }
   var link = node.get$arguments();
-  $assert($notnull_bool(!$notnull_bool(link.isEmpty()) && link.get$tail().isEmpty()), "!link.isEmpty() && link.tail.isEmpty()", "builder.dart", 456, 12);
+  $assert($notnull_bool(!$notnull_bool(link.isEmpty()) && link.get$tail().isEmpty$0()), "!link.isEmpty() && link.tail.isEmpty()", "builder.dart", 456, 12);
   this.visit((($0 = link.get$head()) && $0.is$Node()));
   var value = this.pop();
   this.definitions.$setindex(this.elements.$index(node), value);
@@ -8166,6 +9356,12 @@ SsaBuilder.prototype.visitVariableDefinitions = function(node) {
     }
   }
 }
+SsaBuilder.prototype.add$1 = function($0) {
+  return this.add(($0 && $0.is$HInstruction()));
+};
+SsaBuilder.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$Node()));
+};
 // ********** Code for SsaCodeGeneratorTask **************
 function SsaCodeGeneratorTask(compiler) {
   CompilerTask.call(this, compiler);
@@ -8218,6 +9414,7 @@ function SsaCodeGenerator(compiler, buffer) {
   this.buffer = buffer;
   // Initializers done
 }
+SsaCodeGenerator.prototype.is$HVisitor = function(){return this;};
 SsaCodeGenerator.prototype.visitGraph = function(graph) {
   this.currentGraph = graph;
   this.indent++;
@@ -8269,7 +9466,7 @@ SsaCodeGenerator.prototype.use = function(argument) {
   }
 }
 SsaCodeGenerator.prototype.visit = function(node) {
-  return node.accept(this);
+  return node.accept$1(this);
 }
 SsaCodeGenerator.prototype.visitAdd = function(node) {
   this.invoke(const$274/*const SourceString('\$add')*/, node.inputs);
@@ -8426,6 +9623,7 @@ SsaCodeGenerator.prototype.addIndentation = function() {
     this.buffer.add('  ');
   }
 }
+SsaCodeGenerator.prototype.visit$1 = SsaCodeGenerator.prototype.visit;
 // ********** Code for HGraphVisitor **************
 function HGraphVisitor() {
   // Initializers done
@@ -8537,6 +9735,7 @@ function HBaseVisitor() {
   // Initializers done
 }
 $inherits(HBaseVisitor, HGraphVisitor);
+HBaseVisitor.prototype.is$HVisitor = function(){return this;};
 HBaseVisitor.prototype.visitBasicBlock = function(node) {
   this.currentBlock = node;
   var instruction = node.first;
@@ -8626,7 +9825,7 @@ HBasicBlock.withId$ctor = function(id) {
   this.dominator = null
   this.id = id;
   this.predecessors = [];
-  this.successors = const$15/*const []*/;
+  this.successors = const$5/*const <HInstruction>[]*/;
   this.dominatedBlocks = [];
   // Initializers done
 }
@@ -8784,6 +9983,18 @@ HBasicBlock.prototype.assignCommonDominator = function(predecessor) {
     }
   }
 }
+HBasicBlock.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
+HBasicBlock.prototype.add$1 = function($0) {
+  return this.add(($0 && $0.is$HInstruction()));
+};
+HBasicBlock.prototype.isExitBlock$0 = function() {
+  return this.isExitBlock();
+};
+HBasicBlock.prototype.last$0 = function() {
+  return this.last();
+};
 // ********** Code for HInstruction **************
 function HInstruction(inputs) {
   this._usedBy = null
@@ -8826,7 +10037,7 @@ HInstruction.prototype.setUseGvn = function() {
   this.setFlag(3/*HInstruction.FLAG_USE_GVN*/);
 }
 HInstruction.prototype.get$usedBy = function() {
-  if (this._usedBy == null) return const$15/*const []*/;
+  if (this._usedBy == null) return const$5/*const <HInstruction>[]*/;
   return this._usedBy;
 }
 HInstruction.prototype.isInBasicBlock = function() {
@@ -8837,7 +10048,7 @@ HInstruction.prototype.notifyAddedToBlock = function() {
   this._usedBy = [];
   for (var i = 0;
    i < this.inputs.length; i++) {
-    $assert(this.inputs.$index(i).isInBasicBlock(), "inputs[i].isInBasicBlock()", "nodes.dart", 476, 14);
+    $assert(this.inputs.$index(i).isInBasicBlock$0(), "inputs[i].isInBasicBlock()", "nodes.dart", 476, 14);
     this.inputs.$index(i).get$usedBy().add(this);
   }
   $assert(this.isValid(), "isValid()", "nodes.dart", 479, 12);
@@ -8871,18 +10082,42 @@ HInstruction.prototype.isValid = function() {
   validator.visitInstruction(this);
   return validator.isValid;
 }
+HInstruction.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
+HInstruction.prototype.isInBasicBlock$0 = function() {
+  return this.isInBasicBlock();
+};
+HInstruction.prototype.isLiteralNumber$0 = function() {
+  return this.isLiteralNumber();
+};
+HInstruction.prototype.isLiteralString$0 = function() {
+  return this.isLiteralString();
+};
+HInstruction.prototype.next$0 = function() {
+  return this.next();
+};
+HInstruction.prototype.setGenerateAtUseSite$0 = function() {
+  return this.setGenerateAtUseSite();
+};
 // ********** Code for HConditionalBranch **************
 function HConditionalBranch(inputs) {
   HControlFlow.call(this, inputs);
   // Initializers done
 }
 $inherits(HConditionalBranch, HControlFlow);
+HConditionalBranch.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for HControlFlow **************
 function HControlFlow(inputs) {
   HInstruction.call(this, inputs);
   // Initializers done
 }
 $inherits(HControlFlow, HInstruction);
+HControlFlow.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for HInvoke **************
 function HInvoke(selector, inputs) {
   this.selector = selector;
@@ -8896,6 +10131,12 @@ HInvoke.prototype.toString = function() {
 HInvoke.prototype.accept = function(visitor) {
   return visitor.visitInvoke(this);
 }
+HInvoke.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
+HInvoke.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for HInvokeForeign **************
 function HInvokeForeign(code, inputs) {
   HInvoke.call(this, code, inputs);
@@ -8905,6 +10146,9 @@ $inherits(HInvokeForeign, HInvoke);
 HInvokeForeign.prototype.accept = function(visitor) {
   return visitor.visitInvokeForeign(this);
 }
+HInvokeForeign.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
 // ********** Code for HArithmetic **************
 function HArithmetic(selector, inputs) {
   HInvoke.call(this, selector, inputs);
@@ -8918,12 +10162,12 @@ HArithmetic.prototype.prepareGvn = function() {
 }
 // ********** Code for HAdd **************
 function HAdd(inputs) {
-  HArithmetic.call(this, const$247/*const SourceString('+')*/, inputs);
+  HArithmetic.call(this, const$249/*const SourceString('+')*/, inputs);
   // Initializers done
 }
 $inherits(HAdd, HArithmetic);
 HAdd.prototype.prepareGvn = function() {
-  if (!$notnull_bool(this.inputs.$index(0).isLiteralNumber())) return;
+  if (!$notnull_bool(this.inputs.$index(0).isLiteralNumber$0())) return;
   this.clearAllSideEffects();
   this.setUseGvn();
 }
@@ -8933,9 +10177,12 @@ HAdd.prototype.accept = function(visitor) {
 HAdd.prototype.evaluate = function(a, b) {
   return a + b;
 }
+HAdd.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
 // ********** Code for HDivide **************
 function HDivide(inputs) {
-  HArithmetic.call(this, const$250/*const SourceString('/')*/, inputs);
+  HArithmetic.call(this, const$252/*const SourceString('/')*/, inputs);
   // Initializers done
 }
 $inherits(HDivide, HArithmetic);
@@ -8945,9 +10192,12 @@ HDivide.prototype.accept = function(visitor) {
 HDivide.prototype.evaluate = function(a, b) {
   return a / b;
 }
+HDivide.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
 // ********** Code for HMultiply **************
 function HMultiply(inputs) {
-  HArithmetic.call(this, const$249/*const SourceString('*')*/, inputs);
+  HArithmetic.call(this, const$251/*const SourceString('*')*/, inputs);
   // Initializers done
 }
 $inherits(HMultiply, HArithmetic);
@@ -8957,9 +10207,12 @@ HMultiply.prototype.accept = function(visitor) {
 HMultiply.prototype.evaluate = function(a, b) {
   return a * b;
 }
+HMultiply.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
 // ********** Code for HSubtract **************
 function HSubtract(inputs) {
-  HArithmetic.call(this, const$248/*const SourceString('-')*/, inputs);
+  HArithmetic.call(this, const$250/*const SourceString('-')*/, inputs);
   // Initializers done
 }
 $inherits(HSubtract, HArithmetic);
@@ -8969,9 +10222,12 @@ HSubtract.prototype.accept = function(visitor) {
 HSubtract.prototype.evaluate = function(a, b) {
   return a - b;
 }
+HSubtract.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
 // ********** Code for HTruncatingDivide **************
 function HTruncatingDivide(inputs) {
-  HArithmetic.call(this, const$252/*const SourceString('~/')*/, inputs);
+  HArithmetic.call(this, const$254/*const SourceString('~/')*/, inputs);
   // Initializers done
 }
 $inherits(HTruncatingDivide, HArithmetic);
@@ -8981,9 +10237,12 @@ HTruncatingDivide.prototype.accept = function(visitor) {
 HTruncatingDivide.prototype.evaluate = function(a, b) {
   return $truncdiv(a, b);
 }
+HTruncatingDivide.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
 // ********** Code for HEquals **************
 function HEquals(inputs) {
-  HInvoke.call(this, const$253/*const SourceString('==')*/, inputs);
+  HInvoke.call(this, const$255/*const SourceString('==')*/, inputs);
   // Initializers done
 }
 $inherits(HEquals, HInvoke);
@@ -8995,9 +10254,12 @@ HEquals.prototype.prepareGvn = function() {
 HEquals.prototype.accept = function(visitor) {
   return visitor.visitEquals(this);
 }
+HEquals.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
 // ********** Code for HExit **************
 function HExit() {
-  HControlFlow.call(this, const$15/*const []*/);
+  HControlFlow.call(this, const$5/*const <HInstruction>[]*/);
   // Initializers done
 }
 $inherits(HExit, HControlFlow);
@@ -9007,9 +10269,15 @@ HExit.prototype.toString = function() {
 HExit.prototype.accept = function(visitor) {
   return visitor.visitExit(this);
 }
+HExit.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
+HExit.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for HGoto **************
 function HGoto() {
-  HControlFlow.call(this, const$15/*const []*/);
+  HControlFlow.call(this, const$5/*const <HInstruction>[]*/);
   // Initializers done
 }
 $inherits(HGoto, HControlFlow);
@@ -9019,6 +10287,12 @@ HGoto.prototype.toString = function() {
 HGoto.prototype.accept = function(visitor) {
   return visitor.visitGoto(this);
 }
+HGoto.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
+HGoto.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for HIf **************
 function HIf(condition, hasElse) {
   this.hasElse = hasElse;
@@ -9032,6 +10306,12 @@ HIf.prototype.toString = function() {
 HIf.prototype.accept = function(visitor) {
   return visitor.visitIf(this);
 }
+HIf.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
+HIf.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for HLoopBranch **************
 function HLoopBranch(condition) {
   HConditionalBranch.call(this, [condition]);
@@ -9044,6 +10324,12 @@ HLoopBranch.prototype.toString = function() {
 HLoopBranch.prototype.accept = function(visitor) {
   return visitor.visitLoopBranch(this);
 }
+HLoopBranch.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
+HLoopBranch.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for HLiteral **************
 function HLiteral(value) {
   this.value = value;
@@ -9070,6 +10356,18 @@ HLiteral.prototype.isLiteralString = function() {
   var $0;
   return !!(($0 = this.value) && $0.is$SourceString);
 }
+HLiteral.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
+HLiteral.prototype.isLiteralNumber$0 = function() {
+  return this.isLiteralNumber();
+};
+HLiteral.prototype.isLiteralString$0 = function() {
+  return this.isLiteralString();
+};
+HLiteral.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for HParameter **************
 function HParameter(parameterIndex) {
   this.parameterIndex = parameterIndex;
@@ -9086,6 +10384,12 @@ HParameter.prototype.toString = function() {
 HParameter.prototype.accept = function(visitor) {
   return visitor.visitParameter(this);
 }
+HParameter.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
+HParameter.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for HPhi **************
 function HPhi(input1, input2) {
   HInstruction.call(this, [input1, input2]);
@@ -9099,6 +10403,12 @@ HPhi.prototype.toString = function() {
 HPhi.prototype.accept = function(visitor) {
   return visitor.visitPhi(this);
 }
+HPhi.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
+HPhi.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for HReturn **************
 function HReturn(value) {
   HControlFlow.call(this, [value]);
@@ -9111,6 +10421,12 @@ HReturn.prototype.toString = function() {
 HReturn.prototype.accept = function(visitor) {
   return visitor.visitReturn(this);
 }
+HReturn.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
+HReturn.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for HThrow **************
 function HThrow(value) {
   HControlFlow.call(this, [value]);
@@ -9123,6 +10439,12 @@ HThrow.prototype.toString = function() {
 HThrow.prototype.accept = function(visitor) {
   return visitor.visitThrow(this);
 }
+HThrow.prototype.accept$1 = function($0) {
+  return this.accept(($0 && $0.is$HVisitor()));
+};
+HThrow.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for SsaOptimizerTask **************
 function SsaOptimizerTask(compiler) {
   CompilerTask.call(this, compiler);
@@ -9178,7 +10500,7 @@ SsaConstantFolder.prototype.visitArithmetic = function(node) {
   var $0;
   var inputs = node.inputs;
   $assert(inputs.length == 2, "inputs.length == 2", "optimize.dart", 57, 12);
-  if ($notnull_bool(inputs.$index(0).isLiteralNumber() && inputs.$index(1).isLiteralNumber())) {
+  if ($notnull_bool(inputs.$index(0).isLiteralNumber$0() && inputs.$index(1).isLiteralNumber$0())) {
     var op1 = (($0 = inputs.$index(0)) && $0.is$HLiteral());
     var op2 = (($0 = inputs.$index(1)) && $0.is$HLiteral());
     try {
@@ -9194,7 +10516,7 @@ SsaConstantFolder.prototype.visitArithmetic = function(node) {
 }
 SsaConstantFolder.prototype.visitAdd = function(node) {
   var $0;
-  if ($notnull_bool(node.inputs.$index(0).isLiteralString())) {
+  if ($notnull_bool(node.inputs.$index(0).isLiteralString$0())) {
     var op1 = (($0 = node.inputs.$index(0)) && $0.is$HLiteral());
     var op2 = (($0 = node.inputs.$index(1)) && $0.is$HLiteral());
     return new HLiteral(new StringWrapper(("" + op1.value + " + " + op2.value + "")));
@@ -9239,7 +10561,7 @@ SsaInstructionMerger.prototype.visitInstruction = function(node) {
     if ((previousUnused instanceof HPhi)) return;
     if (inputs.$index(i).get$usedBy().length != 1) return;
     if (inputs.$index(i) !== previousUnused) return;
-    inputs.$index(i).setGenerateAtUseSite();
+    inputs.$index(i).setGenerateAtUseSite$0();
     previousUnused = previousUnused.previous;
   }
 }
@@ -9380,11 +10702,18 @@ HTracer.prototype.addIndent = function() {
 HTracer.prototype.toString = function() {
   return this.output.toString();
 }
+HTracer.prototype.add$1 = function($0) {
+  return this.add($assert_String($0));
+};
+HTracer.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for HInstructionStringifier **************
 function HInstructionStringifier(currentBlock) {
   this.currentBlock = currentBlock;
   // Initializers done
 }
+HInstructionStringifier.prototype.is$HVisitor = function(){return this;};
 HInstructionStringifier.prototype.visit = function(node) {
   return node.accept(this);
 }
@@ -9468,6 +10797,9 @@ HInstructionStringifier.prototype.visitThrow = function(node) {
 HInstructionStringifier.prototype.visitTruncatingDivide = function(node) {
   return this.visitInvoke(node);
 }
+HInstructionStringifier.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$HInstruction()));
+};
 // ********** Code for HValidator **************
 function HValidator() {
   this.isValid = true
@@ -9500,7 +10832,7 @@ HValidator.prototype.visitBasicBlock = function(block) {
   if ((block.last instanceof HGoto) && block.successors.length != 1) {
     this.markInvalid("Goto node without one successor");
   }
-  if ((block.last instanceof HReturn) && (block.successors.length != 1 || !$notnull_bool(block.successors.$index(0).isExitBlock()))) {
+  if ((block.last instanceof HReturn) && (block.successors.length != 1 || !$notnull_bool(block.successors.$index(0).isExitBlock$0()))) {
     this.markInvalid("Return node with > 1 succesor or not going to exit-block");
   }
   if ((block.last instanceof HExit) && !block.successors.isEmpty()) {
@@ -9567,7 +10899,7 @@ HValidator.everyInstruction = function(instructions, f) {
 HValidator.prototype.visitInstruction = function(instruction) {
   var $this = this; // closure support
   function hasCorrectInputs(instruction) {
-    var inBasicBlock = instruction.isInBasicBlock();
+    var inBasicBlock = $assert_bool(instruction.isInBasicBlock$0());
     return HValidator.everyInstruction(instruction.inputs, (function (input, count) {
       if ($notnull_bool(inBasicBlock)) {
         return HValidator.countInstruction(input.get$usedBy(), (instruction && instruction.is$HInstruction())) == count;
@@ -9579,7 +10911,7 @@ HValidator.prototype.visitInstruction = function(instruction) {
     );
   }
   function hasCorrectUses(instruction) {
-    if (!$notnull_bool(instruction.isInBasicBlock())) return true;
+    if (!$notnull_bool(instruction.isInBasicBlock$0())) return true;
     return HValidator.everyInstruction(instruction.get$usedBy(), (function (use, count) {
       return HValidator.countInstruction(use.inputs, (instruction && instruction.is$HInstruction())) == count;
     })
@@ -9587,6 +10919,12 @@ HValidator.prototype.visitInstruction = function(instruction) {
   }
   this.isValid = $notnull_bool($notnull_bool(this.isValid && hasCorrectInputs(instruction)) && hasCorrectUses(instruction));
 }
+// ********** Code for ValueSetNode **************
+function ValueSetNode() {}
+ValueSetNode.prototype.get$value = function() { return this.value; };
+ValueSetNode.prototype.next$0 = function() {
+  return this.next();
+};
 // ********** Code for top level **************
 //  ********** Library leg **************
 // ********** Code for WorldCompiler **************
@@ -9622,7 +10960,7 @@ WorldCompiler.prototype.spanFromNode = function(node) {
     this.cancel(('cannot find tokens to produce error message for ' + node + '.'));
   }
   var startOffset = begin.get$charOffset();
-  var endOffset = end.get$charOffset() + end.toString().length;
+  var endOffset = end.get$charOffset() + end.toString$0().length;
   return new SourceSpan(this.script.file, startOffset, endOffset);
 }
 WorldCompiler.prototype.reportWarning = function(node, message) {
@@ -9634,7 +10972,7 @@ function Compiler(script) {
   this.script = script;
   // Initializers done
   this.universe = new Universe();
-  this.worklist = DoubleLinkedQueue.DoubleLinkedQueue$from$factory([const$3/*Compiler.MAIN*/]);
+  this.worklist = DoubleLinkedQueue.DoubleLinkedQueue$from$factory([const$7/*Compiler.MAIN*/]);
   this.scanner = new ScannerTask(this);
   this.parser = new ParserTask(this);
   this.resolver = new ResolverTask(this);
@@ -9644,6 +10982,7 @@ function Compiler(script) {
   this.generator = new SsaCodeGeneratorTask(this);
   this.tasks = [this.scanner, this.parser, this.resolver, this.checker, this.builder, this.optimizer, this.generator];
 }
+Compiler.prototype.is$Compiler = function(){return this;};
 Compiler.prototype.ensure = function(condition) {
   if (!$notnull_bool(condition)) this.cancel('failed assertion in leg');
 }
@@ -9678,7 +11017,7 @@ Compiler.prototype.scanCoreLibrary = function() {
   var fileName = join([options.libDir, '..', 'leg', 'lib', 'core.dart']);
   var file = readSync(fileName);
   this.scanner.scan(new leg_Script(file));
-  var element = new ForeignElement(const$243/*const SourceString('JS')*/);
+  var element = new ForeignElement(const$245/*const SourceString('JS')*/);
   this.universe.define(element);
 }
 Compiler.prototype.runCompiler = function() {
@@ -9721,6 +11060,9 @@ Compiler.prototype.getGeneratedCode = function() {
 Compiler.prototype.reportWarning = function(node, message) {
 
 }
+Compiler.prototype.unimplemented$1 = function($0) {
+  return this.unimplemented($assert_String($0));
+};
 // ********** Code for CompilerTask **************
 function CompilerTask(compiler) {
   this.compiler = compiler;
@@ -9748,6 +11090,9 @@ CompilerCancelledException.prototype.toString = function() {
   var banner = 'compiler cancelled';
   return (this.reason != null) ? ('' + banner + ': ' + this.reason + '') : ('' + banner + '');
 }
+CompilerCancelledException.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for ResolverTask **************
 function ResolverTask(compiler) {
   CompilerTask.call(this, compiler);
@@ -9767,6 +11112,9 @@ ResolverTask.prototype.resolve = function(tree) {
   })
   )) && $0.is$Map$Node$Element());
 }
+ResolverTask.prototype.resolve$1 = function($0) {
+  return this.resolve(($0 && $0.is$Node()));
+};
 // ********** Code for ErrorMessages **************
 function ErrorMessages() {}
 ErrorMessages.cannotResolve = function(id) {
@@ -9785,6 +11133,7 @@ function ResolverVisitor(compiler) {
   this.context = new Scope(new TopScope(compiler.universe));
   // Initializers done
 }
+ResolverVisitor.prototype.is$Visitor = function(){return this;};
 ResolverVisitor.prototype.fail = function(node, message) {
   this.compiler.cancel(message);
 }
@@ -9839,7 +11188,7 @@ ResolverVisitor.prototype.visitSend = function(node) {
   this.visit(node.receiver);
   var selector = (($0 = node.selector) && $0.is$Identifier());
   var name = selector.get$source();
-  if ($notnull_bool($notnull_bool($notnull_bool($notnull_bool($notnull_bool($notnull_bool($eq(name, const$247/*const SourceString('+')*/) || $eq(name, const$248/*const SourceString('-')*/)) || $eq(name, const$249/*const SourceString('*')*/)) || $eq(name, const$250/*const SourceString('/')*/)) || $eq(name, const$251/*const SourceString('<')*/)) || $eq(name, const$252/*const SourceString('~/')*/)) || $eq(name, const$253/*const SourceString('==')*/))) {
+  if ($notnull_bool($notnull_bool($notnull_bool($notnull_bool($notnull_bool($notnull_bool($eq(name, const$249/*const SourceString('+')*/) || $eq(name, const$250/*const SourceString('-')*/)) || $eq(name, const$251/*const SourceString('*')*/)) || $eq(name, const$252/*const SourceString('/')*/)) || $eq(name, const$253/*const SourceString('<')*/)) || $eq(name, const$254/*const SourceString('~/')*/)) || $eq(name, const$255/*const SourceString('==')*/))) {
   }
   else {
     target = this.context.lookup(name);
@@ -9890,7 +11239,7 @@ ResolverVisitor.prototype.visitThrow = function(node) {
 }
 ResolverVisitor.prototype.visitTypeAnnotation = function(node) {
   var name = node.typeName;
-  if ($notnull_bool($eq(name.get$source(), const$254/*const SourceString('var')*/))) return null;
+  if ($notnull_bool($eq(name.get$source(), const$256/*const SourceString('var')*/))) return null;
   var element = this.context.lookup(name.get$source());
   if (element == null) {
     this.warning(node, ErrorMessages.cannotResolveType(name));
@@ -9913,15 +11262,19 @@ ResolverVisitor.prototype.useElement = function(node, element) {
   this.mapping.$setindex(node, element);
   return element;
 }
+ResolverVisitor.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$Node()));
+};
 // ********** Code for VariableDefinitionsVisitor **************
 function VariableDefinitionsVisitor(definitions, resolver) {
   this.definitions = definitions;
   this.resolver = resolver;
   // Initializers done
 }
+VariableDefinitionsVisitor.prototype.is$Visitor = function(){return this;};
 VariableDefinitionsVisitor.prototype.visitSendSet = function(node) {
   var $0;
-  $assert(node.get$arguments().get$tail().isEmpty(), "node.arguments.tail.isEmpty()", "resolver.dart", 200, 12);
+  $assert(node.get$arguments().get$tail().isEmpty$0(), "node.arguments.tail.isEmpty()", "resolver.dart", 200, 12);
   if (node.receiver != null) {
     this.resolver.compiler.unimplemented("receiver on a variable definition");
   }
@@ -9947,6 +11300,9 @@ VariableDefinitionsVisitor.prototype.visitNodeList = function(node) {
 VariableDefinitionsVisitor.prototype.visit = function(node) {
   return node.accept(this);
 }
+VariableDefinitionsVisitor.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$Node()));
+};
 // ********** Code for Scope **************
 function Scope(parent) {
   Scope.enclosing$ctor.call(this, parent, parent.enclosingElement);
@@ -9954,7 +11310,7 @@ function Scope(parent) {
 }
 Scope.top$ctor = function() {
   this.parent = null;
-  this.elements = const$246/*const {}*/;
+  this.elements = const$248/*const {}*/;
   this.enclosingElement = null;
   // Initializers done
 }
@@ -9979,6 +11335,12 @@ Scope.prototype.add = function(element) {
   this.elements.$setindex(element.name, element);
   return element;
 }
+Scope.prototype.add$1 = function($0) {
+  return this.add(($0 && $0.is$Element()));
+};
+Scope.prototype.lookup$1 = function($0) {
+  return this.lookup(($0 && $0.is$SourceString()));
+};
 // ********** Code for TopScope **************
 function TopScope(universe) {
   this.universe = universe;
@@ -9992,6 +11354,12 @@ TopScope.prototype.lookup = function(name) {
 TopScope.prototype.add = function(element) {
   $throw("Cannot add an element in the top scope");
 }
+TopScope.prototype.add$1 = function($0) {
+  return this.add(($0 && $0.is$Element()));
+};
+TopScope.prototype.lookup$1 = function($0) {
+  return this.lookup(($0 && $0.is$SourceString()));
+};
 // ********** Code for leg_Script **************
 function leg_Script(file) {
   this.file = file;
@@ -10055,6 +11423,9 @@ SimpleType.prototype.get$element = function() { return this.element; };
 SimpleType.prototype.toString = function() {
   return this.name.toString();
 }
+SimpleType.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for FunctionType **************
 function FunctionType(returnType, parameterTypes) {
   this.returnType = returnType;
@@ -10072,25 +11443,29 @@ FunctionType.prototype.toString = function() {
   sb.add((') -> ' + this.returnType + ''));
   return sb.toString();
 }
+FunctionType.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for Types **************
 function Types() {
-  this.voidType = new SimpleType.named$ctor(const$6/*Types.VOID*/);
-  this.intType = new SimpleType.named$ctor(const$8/*Types.INT*/);
-  this.dynamicType = new SimpleType.named$ctor(const$10/*Types.DYNAMIC*/);
-  this.stringType = new SimpleType.named$ctor(const$12/*Types.STRING*/);
+  this.voidType = new SimpleType.named$ctor(const$10/*Types.VOID*/);
+  this.intType = new SimpleType.named$ctor(const$12/*Types.INT*/);
+  this.dynamicType = new SimpleType.named$ctor(const$14/*Types.DYNAMIC*/);
+  this.stringType = new SimpleType.named$ctor(const$16/*Types.STRING*/);
   // Initializers done
 }
+Types.prototype.is$Types = function(){return this;};
 Types.prototype.lookup = function(s) {
-  if ($notnull_bool($eq(const$6/*Types.VOID*/, s))) {
+  if ($notnull_bool($eq(const$10/*Types.VOID*/, s))) {
     return this.voidType;
   }
-  else if ($notnull_bool($eq(const$8/*Types.INT*/, s))) {
+  else if ($notnull_bool($eq(const$12/*Types.INT*/, s))) {
     return this.intType;
   }
-  else if ($notnull_bool($eq(const$10/*Types.DYNAMIC*/, s) || s.get$stringValue() === 'var')) {
+  else if ($notnull_bool($eq(const$14/*Types.DYNAMIC*/, s) || s.get$stringValue() === 'var')) {
     return this.dynamicType;
   }
-  else if ($notnull_bool($eq(const$12/*Types.STRING*/, s))) {
+  else if ($notnull_bool($eq(const$16/*Types.STRING*/, s))) {
     return this.stringType;
   }
   return null;
@@ -10101,6 +11476,9 @@ Types.prototype.isSubtype = function(r, s) {
 Types.prototype.isAssignable = function(r, s) {
   return $notnull_bool(this.isSubtype(r, s) || this.isSubtype(s, r));
 }
+Types.prototype.lookup$1 = function($0) {
+  return this.lookup(($0 && $0.is$SourceString()));
+};
 // ********** Code for CancelTypeCheckException **************
 function CancelTypeCheckException(node, reason) {
   this.node = node;
@@ -10114,6 +11492,7 @@ function TypeCheckerVisitor(compiler, elements, types) {
   this.types = types;
   // Initializers done
 }
+TypeCheckerVisitor.prototype.is$Visitor = function(){return this;};
 TypeCheckerVisitor.prototype.fail = function(node, reason) {
   var message = 'cannot type-check';
   if (reason != null) {
@@ -10158,7 +11537,7 @@ TypeCheckerVisitor.prototype.visitFor = function(node) {
 }
 TypeCheckerVisitor.prototype.visitFunctionExpression = function(node) {
   var $0;
-  var functionType = (($0 = this.elements.$index(node.name).computeType(this.compiler, this.types)) && $0.is$FunctionType());
+  var functionType = (($0 = this.elements.$index(node.name).computeType$2(this.compiler, this.types)) && $0.is$FunctionType());
   var returnType = functionType.returnType;
   var previous = this.expectedReturnType;
   this.expectedReturnType = returnType;
@@ -10179,7 +11558,7 @@ TypeCheckerVisitor.prototype.visitSend = function(node) {
   var $0;
   var target = this.elements.$index(node);
   if (target != null) {
-    var targetType = target.computeType(this.compiler, this.types);
+    var targetType = target.computeType$2(this.compiler, this.types);
     if ($notnull_bool(node.get$isPropertyAccess())) {
       return (targetType && targetType.is$Type());
     }
@@ -10215,7 +11594,7 @@ TypeCheckerVisitor.prototype.visitSend = function(node) {
   else {
     var selector = (($0 = node.selector) && $0.is$Identifier());
     var name = selector.get$source();
-    if ($notnull_bool($notnull_bool($notnull_bool($notnull_bool($notnull_bool($notnull_bool($eq(name, const$247/*const SourceString('+')*/) || $eq(name, const$257/*const SourceString('=')*/)) || $eq(name, const$248/*const SourceString('-')*/)) || $eq(name, const$249/*const SourceString('*')*/)) || $eq(name, const$250/*const SourceString('/')*/)) || $eq(name, const$251/*const SourceString('<')*/)) || $eq(name, const$252/*const SourceString('~/')*/))) {
+    if ($notnull_bool($notnull_bool($notnull_bool($notnull_bool($notnull_bool($notnull_bool($eq(name, const$249/*const SourceString('+')*/) || $eq(name, const$259/*const SourceString('=')*/)) || $eq(name, const$250/*const SourceString('-')*/)) || $eq(name, const$251/*const SourceString('*')*/)) || $eq(name, const$252/*const SourceString('/')*/)) || $eq(name, const$253/*const SourceString('<')*/)) || $eq(name, const$254/*const SourceString('~/')*/))) {
       return this.types.dynamicType;
     }
     this.fail(node, ('unresolved send ' + name + ''));
@@ -10224,7 +11603,7 @@ TypeCheckerVisitor.prototype.visitSend = function(node) {
 TypeCheckerVisitor.prototype.visitSendSet = function(node) {
   var $0;
   this.compiler.ensure(node.get$arguments() != null && !$notnull_bool(node.get$arguments().isEmpty()));
-  var targetType = (($0 = this.elements.$index(node).computeType(this.compiler, this.types)) && $0.is$Type());
+  var targetType = (($0 = this.elements.$index(node).computeType$2(this.compiler, this.types)) && $0.is$Type());
   var value = (($0 = node.get$arguments().get$head()) && $0.is$Node());
   this.checkAssignable(value, this.type(value), targetType);
   return targetType;
@@ -10303,7 +11682,7 @@ TypeCheckerVisitor.prototype.visitVariableDefinitions = function(node) {
 function Universe() {
   this.elements = $map([]);
   this.generatedCode = $map([]);
-  this.scope = new Element(const$2, null, null);
+  this.scope = new Element(const$6, null, null);
   // Initializers done
 }
 Universe.prototype.find = function(name) {
@@ -10500,6 +11879,9 @@ CoreJs.prototype.generate = function(w) {
     w.writeln($assert_String(opImpl));
   }
 }
+CoreJs.prototype.generate$1 = function($0) {
+  return this.generate(($0 && $0.is$CodeWriter()));
+};
 // ********** Code for WorldGenerator **************
 function WorldGenerator(main, writer) {
   this._inheritsGenerated = false
@@ -10514,11 +11896,11 @@ WorldGenerator.prototype.run = function() {
   var metaGen = new MethodGenerator(this.main, null);
   var mainCall = this.main.invoke((metaGen && metaGen.is$MethodGenerator()), null, null, Arguments.get$EMPTY(), false);
   this.main.declaringType.markUsed();
-  world.corelib.types.$index('BadNumberFormatException').markUsed();
-  world.get$coreimpl().types.$index('NumImplementation').markUsed();
-  world.get$coreimpl().types.$index('StringImplementation').markUsed();
-  world.get$coreimpl().types.$index('MatchImplementation').markUsed();
-  this.genMethod((($0 = world.get$coreimpl().types.$index('MatchImplementation').getConstructor('')) && $0.is$Member()));
+  world.corelib.types.$index('BadNumberFormatException').markUsed$0();
+  world.get$coreimpl().types.$index('NumImplementation').markUsed$0();
+  world.get$coreimpl().types.$index('StringImplementation').markUsed$0();
+  world.get$coreimpl().types.$index('MatchImplementation').markUsed$0();
+  this.genMethod((($0 = world.get$coreimpl().types.$index('MatchImplementation').getConstructor$1('')) && $0.is$Member()));
   this.writeTypes(world.get$coreimpl());
   this.writeTypes(world.corelib);
   this.writeTypes(this.main.declaringType.get$library());
@@ -10636,10 +12018,10 @@ WorldGenerator.prototype.writeType = function(type) {
       standardConstructor.generator.writeDefinition(this.writer, null);
     }
     var $list = type.get$constructors().getValues();
-    for (var $i = type.get$constructors().getValues().iterator(); $i.hasNext(); ) {
-      var c = $i.next();
+    for (var $i = type.get$constructors().getValues().iterator$0(); $i.hasNext$0(); ) {
+      var c = $i.next$0();
       if ($notnull_bool($ne(c.generator, null) && $ne(c, standardConstructor))) {
-        c.generator.writeDefinition(this.writer, null);
+        c.generator.writeDefinition$2(this.writer);
       }
     }
   }
@@ -10681,8 +12063,8 @@ WorldGenerator.prototype.writeType = function(type) {
         }
       }
       var $list = interface_.get$interfaces();
-      for (var $i = interface_.get$interfaces().iterator(); $i.hasNext(); ) {
-        var other = $i.next();
+      for (var $i = interface_.get$interfaces().iterator$0(); $i.hasNext$0(); ) {
+        var other = $i.next$0();
         if (!seen.contains(other)) {
           worklist.addLast(other);
           seen.add(other);
@@ -10716,7 +12098,7 @@ WorldGenerator.prototype._writeDynamicStubs = function(type) {
     var $list = orderValuesByKeys(type.varStubs);
     for (var $i = 0;$i < $list.length; $i++) {
       var stub = $list.$index($i);
-      stub.generate(this.writer);
+      stub.generate$1(this.writer);
     }
   }
 }
@@ -10772,12 +12154,12 @@ WorldGenerator.prototype._writeGlobals = function() {
     this.writer.comment('//  ********** Globals **************');
   }
   var list = this.globals.getValues();
-  list.sort((function (a, b) {
-    return a.compareTo(b);
+  list.sort$1((function (a, b) {
+    return a.compareTo$1(b);
   })
   );
-  for (var $i = list.iterator(); $i.hasNext(); ) {
-    var global = $i.next();
+  for (var $i = list.iterator$0(); $i.hasNext$0(); ) {
+    var global = $i.next$0();
     if (global.field != null) {
       this._writeStaticField(global.field);
     }
@@ -10799,7 +12181,7 @@ WorldGenerator.prototype._compareMembers = function(x, y) {
   }
   if (x.get$span() == null) return 1;
   if (y.get$span() == null) return -1;
-  return x.get$name().compareTo(y.get$name());
+  return $assert_num(x.get$name().compareTo$1(y.get$name()));
 }
 WorldGenerator.prototype.get$_compareMembers = function() {
   return WorldGenerator.prototype._compareMembers.bind(this);
@@ -10808,9 +12190,9 @@ WorldGenerator.prototype.useMapFactory = function() {
   var $0;
   this.corejs.useMap = true;
   var factType = world.get$coreimpl().types.$index('HashMapImplementation');
-  var m = factType.resolveMember('\$setindex');
+  var m = factType.resolveMember$1('\$setindex');
   this.genMethod((($0 = m.get$members().$index(0)) && $0.is$Member()));
-  var c = factType.getConstructor('');
+  var c = factType.getConstructor$1('');
   this.genMethod((c && c.is$Member()));
   return (factType && factType.is$lang_Type());
 }
@@ -10896,6 +12278,9 @@ BlockScope.prototype.getRethrow = function() {
   }
   return scope.rethrow;
 }
+BlockScope.prototype.lookup$1 = function($0) {
+  return this.lookup($assert_String($0));
+};
 // ********** Code for MethodGenerator **************
 function MethodGenerator(method, enclosingMethod) {
   var $0;
@@ -10919,6 +12304,7 @@ function MethodGenerator(method, enclosingMethod) {
   this._freeTemps = [];
 }
 MethodGenerator.prototype.is$MethodGenerator = function(){return this;};
+MethodGenerator.prototype.is$TreeVisitor = function(){return this;};
 MethodGenerator.prototype.get$library = function() {
   return this.method.get$library();
 }
@@ -10987,12 +12373,12 @@ MethodGenerator.prototype.writeDefinition = function(defWriter, lambda) {
   var names = null;
   if (this.captures != null && this.captures.get$length() > 0) {
     names = ListFactory.ListFactory$from$factory(this.captures);
-    names.sort((function (x, y) {
-      return x.compareTo(y);
+    names.sort$1((function (x, y) {
+      return x.compareTo$1(y);
     })
     );
     paramCode = ListFactory.ListFactory$from$factory((names && names.is$Iterable()));
-    paramCode.addAll(this._paramCode);
+    paramCode.addAll$1(this._paramCode);
   }
   var _params = ('(' + Strings.join(this._paramCode, ", ") + ')');
   var params = ('(' + Strings.join((paramCode && paramCode.is$List$String()), ", ") + ')');
@@ -11039,7 +12425,7 @@ MethodGenerator.prototype.writeDefinition = function(defWriter, lambda) {
     $assert(this._usedTemps.get$length() == 0, "_usedTemps.length == 0", "gen.dart", 695, 14);
     this._freeTemps.addAll(this._usedTemps);
     this._freeTemps.sort((function (x, y) {
-      return x.compareTo(y);
+      return x.compareTo$1(y);
     })
     );
     defWriter.writeln(('var ' + Strings.join(this._freeTemps, ", ") + ';'));
@@ -11082,8 +12468,8 @@ MethodGenerator.prototype._provideOptionalParamInfo = function(defWriter) {
       for (var $i = 0;$i < $list.length; $i++) {
         var param = $list.$index($i);
         if ($notnull_bool(param.get$isOptional())) {
-          optNames.add(param.get$name());
-          optValues.add(MethodGenerator._escapeString(param.get$value().code));
+          optNames.add$1(param.get$name());
+          optValues.add$1(MethodGenerator._escapeString(param.get$value().code));
         }
       }
       if (optNames.length > 0) {
@@ -11096,7 +12482,7 @@ MethodGenerator.prototype._provideOptionalParamInfo = function(defWriter) {
         else {
           start = meth.declaringType.get$jsname() + '.prototype.';
         }
-        optNames.addAll(optValues);
+        optNames.addAll$1(optValues);
         var optional = "['" + Strings.join((optNames && optNames.is$List$String()), "', '") + "']";
         defWriter.writeln(('' + start + '' + meth.get$jsname() + '.\$optional = ' + optional + ''));
       }
@@ -11113,10 +12499,10 @@ MethodGenerator.prototype.writeBody = function() {
     for (var $i = 0;$i < $list.length; $i++) {
       var f = $list.$index($i);
       if ((f instanceof FieldMember) && !$notnull_bool(f.get$isStatic())) {
-        var cv = f.computeValue();
+        var cv = f.computeValue$0();
         if ($notnull_bool($ne(cv, null))) {
-          initializers.add(('this.' + f.get$jsname() + ' = ' + cv.code + ''));
-          initializedFields.add(f.get$name());
+          initializers.add$1(('this.' + f.get$jsname() + ' = ' + cv.code + ''));
+          initializedFields.add$1(f.get$name());
         }
       }
     }
@@ -11135,8 +12521,8 @@ MethodGenerator.prototype.writeBody = function() {
       }
       var paramValue = new Value(field.get$returnType(), p.get$name(), p.get$definition().get$span(), false);
       this._paramCode.add(paramValue.code);
-      initializers.add(('this.' + field.get$jsname() + ' = ' + paramValue.code + ';'));
-      initializedFields.add(p.get$name());
+      initializers.add$1(('this.' + field.get$jsname() + ' = ' + paramValue.code + ';'));
+      initializedFields.add$1(p.get$name());
     }
     else {
       var paramValue = this._scope.declareParameter((p && p.is$Parameter()));
@@ -11148,8 +12534,8 @@ MethodGenerator.prototype.writeBody = function() {
     world.error(('unexpected empty body for ' + this.method.name + ''), this.method.get$definition().get$span());
   }
   if ($notnull_bool($ne(initializers, null))) {
-    for (var $i = initializers.iterator(); $i.hasNext(); ) {
-      var i = $i.next();
+    for (var $i = initializers.iterator$0(); $i.hasNext$0(); ) {
+      var i = $i.next$0();
       this.writer.writeln($assert_String(i));
     }
     var declaredInitializers = this.method.get$definition().initializers;
@@ -11178,7 +12564,7 @@ MethodGenerator.prototype.writeBody = function() {
             world.error(('"' + left.get$name().get$name() + '" does not refer to a field'), left.get$span());
             continue;
           }
-          initializedFields.add(f.get$name());
+          initializedFields.add$1(f.get$name());
           this.writer.writeln(('this.' + f.get$jsname() + ' = ' + this.visitValue(init.y).code + ';'));
         }
         else {
@@ -11212,10 +12598,10 @@ MethodGenerator.prototype.writeBody = function() {
   }
   if ($notnull_bool($ne(initializedFields, null))) {
     var $list = this.method.declaringType.get$members().getKeys();
-    for (var $i = this.method.declaringType.get$members().getKeys().iterator(); $i.hasNext(); ) {
-      var name = $i.next();
+    for (var $i = this.method.declaringType.get$members().getKeys().iterator$0(); $i.hasNext$0(); ) {
+      var name = $i.next$0();
       var member = this.method.declaringType.get$members().$index(name);
-      if ($notnull_bool((member instanceof FieldMember) && member.isFinal) && !$notnull_bool(member.get$isStatic()) && !initializedFields.contains(name)) {
+      if ($notnull_bool((member instanceof FieldMember) && member.isFinal) && !$notnull_bool(member.get$isStatic()) && !$notnull_bool(initializedFields.contains$1(name))) {
         world.error(('Field "' + name + '" is final and was not initialized'), this.method.get$definition().get$span());
       }
     }
@@ -11240,7 +12626,7 @@ MethodGenerator.prototype._writeInitializerCall = function(node) {
   else {
     world.error('bad call in initializers', node.span);
   }
-  var m = target.type.getConstructor(contructorName);
+  var m = target.type.getConstructor$1(contructorName);
   this.method.set$initDelegate(m);
   var other = m;
   while ($notnull_bool($ne(other, null))) {
@@ -11269,7 +12655,7 @@ MethodGenerator.prototype._makeArgs = function(arguments) {
     else if ($notnull_bool(seenLabel)) {
       world.error('bare argument can not follow named arguments', arg.get$span());
     }
-    args.add(this.visitValue((($0 = arg.get$value()) && $0.is$lang_Expression())));
+    args.add$1(this.visitValue((($0 = arg.get$value()) && $0.is$lang_Expression())));
   }
   return new Arguments(arguments, args);
 }
@@ -11282,7 +12668,7 @@ MethodGenerator.prototype.visitStatementsInBlock = function(body) {
     var $list = block.body;
     for (var $i = 0;$i < $list.length; $i++) {
       var stmt = $list.$index($i);
-      stmt.visit(this);
+      stmt.visit$1(this);
     }
   }
   else {
@@ -11299,33 +12685,33 @@ MethodGenerator.prototype._popBlock = function() {
 MethodGenerator.prototype._makeLambdaMethod = function(name, func) {
   var meth = new MethodMember(name, this.method.declaringType, func);
   meth.isLambda = true;
-  meth.resolve(this.method.declaringType);
+  meth.resolve$1(this.method.declaringType);
   world.gen.genMethod((meth && meth.is$Member()), this);
   return (meth && meth.is$MethodMember());
 }
 MethodGenerator.prototype.visitBool = function(node) {
-  return this.visitValue(node).convertTo(this, world.nonNullBool, node, false);
+  return this.visitValue(node).convertTo$3(this, world.nonNullBool, node);
 }
 MethodGenerator.prototype.visitValue = function(node) {
   if (node == null) return null;
   var value = node.visit(this);
-  value.checkFirstClass(node.span);
+  value.checkFirstClass$1(node.span);
   return value;
 }
 MethodGenerator.prototype.visitTypedValue = function(node, expectedType) {
-  return this.visitValue(node).convertTo(this, expectedType, node, false);
+  return this.visitValue(node).convertTo$3(this, expectedType, node);
 }
 MethodGenerator.prototype.visitVoid = function(node) {
   if ((node instanceof PostfixExpression)) {
     var value = this.visitPostfixExpression((node && node.is$PostfixExpression()), true);
-    value.checkFirstClass(node.span);
+    value.checkFirstClass$1(node.span);
     return value;
   }
   return this.visitValue(node);
 }
 MethodGenerator.prototype.visitDietStatement = function(node) {
   var parser = new lang_Parser(node.span.file, false, false, false, node.span.start);
-  this.visitStatementsInBlock(parser.block());
+  this.visitStatementsInBlock(parser.block$0());
   return false;
 }
 MethodGenerator.prototype.visitVariableDefinition = function(node) {
@@ -11357,7 +12743,7 @@ MethodGenerator.prototype.visitVariableDefinition = function(node) {
       this.writer.write(('' + val.code + ''));
     }
     else {
-      value = value.convertTo(this, (type && type.is$lang_Type()), (($0 = node.values.$index(i)) && $0.is$lang_Node()), false);
+      value = value.convertTo$3(this, type, node.values.$index(i));
       this.writer.write(('' + val.code + ' = ' + value.code + ''));
     }
   }
@@ -11369,7 +12755,7 @@ MethodGenerator.prototype.visitFunctionDefinition = function(node) {
   var name = world.toJsIdentifier(node.name.name);
   var meth = this._makeLambdaMethod($assert_String(name), node);
   var funcValue = this._scope.create($assert_String(name), (($0 = meth.get$functionType()) && $0.is$lang_Type()), this.method.get$definition().get$span(), false);
-  meth.generator.writeDefinition(this.writer, null);
+  meth.generator.writeDefinition$2(this.writer);
   return false;
 }
 MethodGenerator.prototype.visitReturnStatement = function(node) {
@@ -11408,7 +12794,7 @@ MethodGenerator.prototype.visitAssertStatement = function(node) {
   var test = this.visitValue(node.test);
   if ($notnull_bool(options.enableAsserts)) {
     var err = world.corelib.types.$index('AssertError');
-    world.gen.genMethod((($0 = err.getConstructor('')) && $0.is$Member()));
+    world.gen.genMethod((($0 = err.getConstructor$1('')) && $0.is$Member()));
     world.gen.genMethod((($0 = err.get$members().$index('toString')) && $0.is$Member()));
     var span = node.test.span;
     var line = span.file.getLine(span.start);
@@ -11530,9 +12916,9 @@ MethodGenerator.prototype._genToDartException = function(ex, node) {
         'NullPointerException', 'ObjectNotClosureException',
         'NoSuchMethodException', 'StackOverflowException']*/;
   var target = new Value(world.varType, 'this', node.span, true);
-  for (var $i = types.iterator(); $i.hasNext(); ) {
-    var name = $i.next();
-    world.corelib.types.$index(name).markUsed();
+  for (var $i = types.iterator$0(); $i.hasNext$0(); ) {
+    var name = $i.next$0();
+    world.corelib.types.$index(name).markUsed$0();
     world.corelib.types.$index(name).get$members().$index('toString').invoke$4(this, node, target, Arguments.get$EMPTY());
   }
   this.writer.writeln(('' + ex + ' = \$toDartException(' + ex + ');'));
@@ -11557,7 +12943,7 @@ MethodGenerator.prototype.visitTryStatement = function(node) {
     }
     this._genToDartException(ex.code, node);
     if (!$notnull_bool(ex.type.get$isVar())) {
-      var test = ex.instanceOf(this, (($0 = ex.type) && $0.is$lang_Type()), catch_.get$exception().get$span(), false, true);
+      var test = ex.instanceOf$3$isTrue$forceCheck(this, ex.type, catch_.get$exception().get$span(), false, true);
       this.writer.writeln(('if (' + test.code + ') throw ' + ex.code + ';'));
     }
     this.visitStatementsInBlock((($0 = node.catches.$index(0).body) && $0.is$lang_Statement()));
@@ -11585,7 +12971,7 @@ MethodGenerator.prototype.visitTryStatement = function(node) {
       this._pushBlock(false);
       var tmp = this._scope.declare((($0 = catch_.get$exception()) && $0.is$DeclaredIdentifier()));
       if (!$notnull_bool(tmp.type.get$isVar())) {
-        var test = ex.instanceOf(this, (($0 = tmp.type) && $0.is$lang_Type()), catch_.get$exception().get$span(), true, true);
+        var test = ex.instanceOf$3$isTrue$forceCheck(this, tmp.type, catch_.get$exception().get$span(), true, true);
         if (i == 0) {
           this.writer.enterBlock(('if (' + test.code + ') {'));
         }
@@ -11671,7 +13057,7 @@ MethodGenerator.prototype._visitAllStatements = function(statementList, exits) {
   for (var i = 0;
    i < statementList.length; i++) {
     var stmt = statementList.$index(i);
-    exits = stmt.visit(this);
+    exits = stmt.visit$1(this);
     if ($notnull_bool($ne(stmt, statementList.$index(statementList.length - 1)) && exits)) {
       world.warning('unreachable code', statementList.$index(i + 1).get$span());
     }
@@ -11753,7 +13139,7 @@ MethodGenerator.prototype.visitLambdaExpression = function(node) {
   }
   var meth = this._makeLambdaMethod($assert_String(name), node.func);
   var w = new CodeWriter();
-  meth.generator.writeDefinition((w && w.is$CodeWriter()), node);
+  meth.generator.writeDefinition$2(w, node);
   return new Value(meth.get$functionType(), w.get$text(), node.span, true);
 }
 MethodGenerator.prototype.visitCallExpression = function(node) {
@@ -11799,7 +13185,7 @@ MethodGenerator.prototype.visitBinaryExpression = function(node) {
       return EvaluatedValue.EvaluatedValue$factory((($0 = x.type) && $0.is$lang_Type()), value, ('' + value + ''), node.span);
     }
     var ret = new Value(lang_Type.union((($0 = x.type) && $0.is$lang_Type()), (($0 = y.type) && $0.is$lang_Type())), code, node.span, true);
-    return ret.convertTo(this, world.nonNullBool, node, false);
+    return ret.convertTo$3(this, world.nonNullBool, node);
   }
   else if (kind == 50/*TokenKind.EQ_STRICT*/ || kind == 51/*TokenKind.NE_STRICT*/) {
     var x = this.visitValue(node.x);
@@ -11855,7 +13241,6 @@ MethodGenerator.prototype._visitAssign = function(kind, xn, yn, position, captur
   }
 }
 MethodGenerator.prototype._visitVarAssign = function(kind, xn, yn, position, captureOriginal) {
-  var $0;
   var name = xn.name.name;
   var x = this._scope.lookup(name);
   var y = this.visitValue(yn);
@@ -11864,16 +13249,16 @@ MethodGenerator.prototype._visitVarAssign = function(kind, xn, yn, position, cap
     if ($notnull_bool($ne(members, null))) {
       x = this._makeThisOrType(position.span);
       if (kind == 0) {
-        return x.set_(this, name, position, (y && y.is$Value()), false);
+        return x.set_$4(this, name, position, y);
       }
       else if ($notnull_bool(!$notnull_bool(members.get$treatAsField()) || members.get$containsMethods())) {
-        var right = x.get_(this, name, position);
+        var right = x.get_$3(this, name, position);
         right = captureOriginal((right && right.is$Value()));
         y = right.invoke$4(this, TokenKind.binaryMethodName(kind), position, new Arguments(null, [y]));
-        return x.set_(this, name, position, (y && y.is$Value()), false);
+        return x.set_$4(this, name, position, y);
       }
       else {
-        x = x.get_(this, name, position);
+        x = x.get_$3(this, name, position);
       }
     }
     else {
@@ -11882,7 +13267,7 @@ MethodGenerator.prototype._visitVarAssign = function(kind, xn, yn, position, cap
         world.warning(('can not resolve ' + name + ''), xn.span);
         return this._makeMissingValue(name);
       }
-      members = new MemberSet(member);
+      members = new MemberSet(member, false);
       if ($notnull_bool(!$notnull_bool(members.get$treatAsField()) || members.get$containsMethods())) {
         if (kind != 0) {
           var right = members._get$3(this, position, x);
@@ -11896,7 +13281,7 @@ MethodGenerator.prototype._visitVarAssign = function(kind, xn, yn, position, cap
       }
     }
   }
-  y = y.convertTo(this, (($0 = x.type) && $0.is$lang_Type()), yn, false);
+  y = y.convertTo$3(this, x.type, yn);
   if (kind == 0) {
     x = captureOriginal((x && x.is$Value()));
     return new Value(y.type, ('' + x.code + ' = ' + y.code + ''), position.span, true);
@@ -11938,7 +13323,7 @@ MethodGenerator.prototype._visitDotAssign = function(kind, xn, yn, position, cap
   var tmptarget = target;
   if (kind != 0) {
     tmptarget = this.getTemp((target && target.is$Value()));
-    var right = tmptarget.get_(this, xn.name.name, xn.name);
+    var right = tmptarget.get_$3(this, xn.name.name, xn.name);
     right = captureOriginal((right && right.is$Value()));
     y = right.invoke$4(this, TokenKind.binaryMethodName(kind), position, new Arguments(null, [y]));
   }
@@ -11969,13 +13354,13 @@ MethodGenerator.prototype.visitUnaryExpression = function(node) {
         return EvaluatedValue.EvaluatedValue$factory((($0 = value.type) && $0.is$lang_Type()), newVal, ('' + newVal + ''), node.span);
       }
       else {
-        var newVal = value.convertTo(this, world.nonNullBool, node, false);
+        var newVal = value.convertTo$3(this, world.nonNullBool, node);
         return new Value(newVal.type, ('!' + newVal.code + ''), node.span, true);
       }
 
     case 42/*TokenKind.ADD*/:
 
-      return value.convertTo(this, world.numType, node, false);
+      return value.convertTo$3(this, world.numType, node);
 
     case 43/*TokenKind.SUB*/:
     case 18/*TokenKind.BIT_NOT*/:
@@ -12034,7 +13419,7 @@ MethodGenerator.prototype.visitNewExpression = function(node) {
   }
   if ($notnull_bool($eq(constructorName, '') && !(typeRef instanceof GenericTypeReference)) && typeRef.names != null) {
     var names = ListFactory.ListFactory$from$factory(typeRef.names);
-    constructorName = names.removeLast().get$name();
+    constructorName = names.removeLast$0().get$name();
     if (names.length == 0) names = null;
     typeRef = new NameTypeReference(typeRef.isFinal, typeRef.get$name(), names, typeRef.get$span());
   }
@@ -12043,7 +13428,7 @@ MethodGenerator.prototype.visitNewExpression = function(node) {
     type = type.get$library().findTypeByName($assert_String(constructorName));
     constructorName = '';
   }
-  var m = type.getConstructor(constructorName);
+  var m = type.getConstructor$1(constructorName);
   if ($notnull_bool(m == null)) {
     var name = type.get$jsname();
     if ($notnull_bool(type.get$isVar())) {
@@ -12073,26 +13458,26 @@ MethodGenerator.prototype.visitListExpression = function(node) {
   for (var $i = 0;$i < $list.length; $i++) {
     var item = $list.$index($i);
     var arg = this.visitValue((item && item.is$lang_Expression()));
-    argValues.add(arg);
+    argValues.add$1(arg);
     if ($notnull_bool(node.isConst)) {
       if (!$notnull_bool(arg.get$isConst())) {
         world.error('const list can only contain const values', item.get$span());
-        argsCode.add(arg.code);
+        argsCode.add$1(arg.code);
       }
       else {
-        argsCode.add(arg.get$canonicalCode());
+        argsCode.add$1(arg.get$canonicalCode());
       }
     }
     else {
-      argsCode.add(arg.code);
+      argsCode.add$1(arg.code);
     }
   }
-  world.get$coreimpl().types.$index('ListFactory').markUsed();
+  world.get$coreimpl().types.$index('ListFactory').markUsed$0();
   var code = ('[' + Strings.join((argsCode && argsCode.is$List$String()), ", ") + ']');
   var value = new Value(world.listType, code, node.span, true);
   if ($notnull_bool(node.isConst)) {
     var immutableList = world.get$coreimpl().types.$index('ImmutableList');
-    var immutableListCtor = immutableList.getConstructor('from');
+    var immutableListCtor = immutableList.getConstructor$1('from');
     var result = immutableListCtor.invoke$4(this, node, null, new Arguments(null, [value]));
     value = world.gen.globalForConst(ConstListValue.ConstListValue$factory((immutableList && immutableList.is$lang_Type()), (argValues && argValues.is$List$EvaluatedValue()), ('const ' + code + ''), result.code, node.span), (argValues && argValues.is$List$Value()));
   }
@@ -12108,29 +13493,29 @@ MethodGenerator.prototype.visitMapExpression = function(node) {
     var key = this.visitTypedValue((($0 = node.items.$index(i)) && $0.is$lang_Expression()), world.stringType);
     var valueItem = node.items.$index(i + 1);
     var value = this.visitValue((valueItem && valueItem.is$lang_Expression()));
-    argValues.add(key);
-    argValues.add(value);
+    argValues.add$1(key);
+    argValues.add$1(value);
     if ($notnull_bool(node.isConst)) {
       if (!$notnull_bool(key.get$isConst()) || !$notnull_bool(value.get$isConst())) {
         world.error('const map can only contain const values', valueItem.get$span());
-        argsCode.add(key.code);
-        argsCode.add(value.code);
+        argsCode.add$1(key.code);
+        argsCode.add$1(value.code);
       }
       else {
-        argsCode.add(key.get$canonicalCode());
-        argsCode.add(value.get$canonicalCode());
+        argsCode.add$1(key.get$canonicalCode());
+        argsCode.add$1(value.get$canonicalCode());
       }
     }
     else {
-      argsCode.add(key.code);
-      argsCode.add(value.code);
+      argsCode.add$1(key.code);
+      argsCode.add$1(value.code);
     }
   }
   var argList = ('[' + Strings.join((argsCode && argsCode.is$List$String()), ", ") + ']');
   var code = ('\$map(' + argList + ')');
   if ($notnull_bool(node.isConst)) {
     var immutableMap = world.get$coreimpl().types.$index('ImmutableMap');
-    var immutableMapCtor = immutableMap.getConstructor('');
+    var immutableMapCtor = immutableMap.getConstructor$1('');
     var argsValue = new Value(world.listType, argList, node.span, true);
     var result = immutableMapCtor.invoke$4(this, node, null, new Arguments(null, [argsValue]));
     var value = ConstMapValue.ConstMapValue$factory((immutableMap && immutableMap.is$lang_Type()), (argValues && argValues.is$List$EvaluatedValue()), code, result.code, node.span);
@@ -12149,7 +13534,7 @@ MethodGenerator.prototype.visitConditionalExpression = function(node) {
 MethodGenerator.prototype.visitIsExpression = function(node) {
   var value = this.visitValue(node.x);
   var type = this.method.resolveType(node.type, false);
-  return value.instanceOf(this, (type && type.is$lang_Type()), node.span, node.isTrue, false);
+  return value.instanceOf$4(this, type, node.span, node.isTrue);
 }
 MethodGenerator.prototype.visitParenExpression = function(node) {
   var $0;
@@ -12161,13 +13546,13 @@ MethodGenerator.prototype.visitParenExpression = function(node) {
 }
 MethodGenerator.prototype.visitDotExpression = function(node) {
   var target = node.self.visit(this);
-  return target.get_(this, node.name.name, node.name);
+  return target.get_$3(this, node.name.name, node.name);
 }
 MethodGenerator.prototype.visitVarExpression = function(node) {
   var name = node.name.name;
   var ret = this._scope.lookup(name);
   if ($notnull_bool($ne(ret, null))) return ret;
-  return this._makeThisOrType(node.span).get_(this, name, node);
+  return this._makeThisOrType(node.span).get_$3(this, name, node);
 }
 MethodGenerator.prototype._makeMissingValue = function(name) {
   return new Value(world.varType, ('' + name + '()/*NotFound*/'), null, true);
@@ -12192,28 +13577,28 @@ MethodGenerator.prototype.visitLiteralExpression = function(node) {
   if (!!(($0 = node.value) && $0.is$List)) {
     var items = [];
     var $list = node.value;
-    for (var $i = node.value.iterator(); $i.hasNext(); ) {
-      var item = $i.next();
+    for (var $i = node.value.iterator$0(); $i.hasNext$0(); ) {
+      var item = $i.next$0();
       var val = this.visitValue((item && item.is$lang_Expression()));
       val.invoke$4(this, 'toString', item, Arguments.get$EMPTY());
       var code = val.code;
       if ((item instanceof BinaryExpression) || (item instanceof ConditionalExpression)) {
         code = ('(' + code + ')');
       }
-      items.add(code);
+      items.add$1(code);
     }
     return new Value(type, ('(' + Strings.join((items && items.is$List$String()), " + ") + ')'), node.span, true);
   }
   var text = node.text;
   if ($notnull_bool(type.get$isString())) {
-    if (text.startsWith('@')) {
+    if ($notnull_bool(text.startsWith$1('@'))) {
       text = MethodGenerator._escapeString(parseStringLiteral($assert_String(text)));
       text = ('"' + text + '"');
     }
     else if ($notnull_bool(isMultilineString($assert_String(text)))) {
       text = parseStringLiteral($assert_String(text));
-      text = text.replaceAll('\n', '\\n');
-      text = text.replaceAll('"', '\\"');
+      text = text.replaceAll$2('\n', '\\n');
+      text = text.replaceAll$2('"', '\\"');
       text = ('"' + text + '"');
     }
     if (text !== node.text) {
@@ -12225,8 +13610,10 @@ MethodGenerator.prototype.visitLiteralExpression = function(node) {
 }
 MethodGenerator.prototype.visitPostfixExpression$1 = function($0) {
   return this.visitPostfixExpression(($0 && $0.is$PostfixExpression()), false);
-}
-;
+};
+MethodGenerator.prototype.writeDefinition$2 = function($0, $1) {
+  return this.writeDefinition(($0 && $0.is$CodeWriter()), ($1 && $1.is$LambdaExpression()));
+};
 // ********** Code for Arguments **************
 function Arguments(nodes, values) {
   this.nodes = nodes;
@@ -12238,7 +13625,7 @@ Arguments.Arguments$bare$factory = function(arity) {
   var values = [];
   for (var i = 0;
    i < arity; i++) {
-    values.add(new Value(world.varType, ('\$' + i + ''), null, false));
+    values.add$1(new Value(world.varType, ('\$' + i + ''), null, false));
   }
   return new Arguments(null, values);
 }
@@ -12296,7 +13683,7 @@ Arguments.prototype.getCode = function() {
   var argsCode = [];
   for (var i = 0;
    i < this.get$length(); i++) {
-    argsCode.add(this.values.$index(i).code);
+    argsCode.add$1(this.values.$index(i).code);
   }
   Arguments.removeTrailingNulls((argsCode && argsCode.is$List$Value()));
   return Strings.join((argsCode && argsCode.is$List$String()), ", ");
@@ -12310,7 +13697,7 @@ Arguments.prototype.getNames = function() {
   var names = [];
   for (var i = this.get$bareCount();
    i < this.get$length(); i++) {
-    names.add(this.getName(i));
+    names.add$1(this.getName(i));
   }
   return (names && names.is$List$String());
 }
@@ -12318,13 +13705,13 @@ Arguments.prototype.toCallStubArgs = function() {
   var result = [];
   for (var i = 0;
    i < this.get$bareCount(); i++) {
-    result.add(new Value(world.varType, ('\$' + i + ''), null, false));
+    result.add$1(new Value(world.varType, ('\$' + i + ''), null, false));
   }
   for (var i = this.get$bareCount();
    i < this.get$length(); i++) {
     var name = this.getName(i);
     if ($notnull_bool(name == null)) name = ('\$' + i + '');
-    result.add(new Value(world.varType, name, null, false));
+    result.add$1(new Value(world.varType, name, null, false));
   }
   return new Arguments(this.nodes, result);
 }
@@ -12402,18 +13789,18 @@ Library.prototype._addMember = function(member) {
     var mset = this._privateMembers.$index(member.name);
     if ($notnull_bool(mset == null)) {
       var $list = world.libraries.getValues();
-      for (var $i = world.libraries.getValues().iterator(); $i.hasNext(); ) {
-        var lib = $i.next();
+      for (var $i = world.libraries.getValues().iterator$0(); $i.hasNext$0(); ) {
+        var lib = $i.next$0();
         if (lib._privateMembers.containsKey(member.name)) {
           member.set$jsname(('_' + this.get$jsname() + '' + member.name + ''));
           break;
         }
       }
-      mset = new MemberSet(member);
+      mset = new MemberSet(member, false);
       this._privateMembers.$setindex(member.name, mset);
     }
     else {
-      mset.get$members().add(member);
+      mset.get$members().add$1(member);
     }
   }
   else {
@@ -12424,7 +13811,7 @@ Library.prototype.getOrAddFunctionType = function(name, func, inType) {
   var def = new FunctionTypeDefinition(func, null, func.span);
   var type = new DefinedType(name, this, def, false);
   type.addMethod('\$call', func);
-  type.members.$index('\$call').resolve(inType);
+  type.members.$index('\$call').resolve$1(inType);
   type.interfaces = [world.functionType];
   return type;
 }
@@ -12433,7 +13820,7 @@ Library.prototype.addType = function(name, definition, isClass) {
   if (this.types.containsKey(name)) {
     var existingType = this.types.$index(name);
     if ($notnull_bool(this.get$isCore() && existingType.get$definition() == null)) {
-      existingType.setDefinition((definition && definition.is$Definition()));
+      existingType.setDefinition$1(definition);
     }
     else {
       world.warning(('duplicate definition of ' + name + ''), definition.span);
@@ -12526,18 +13913,27 @@ Library.prototype.resolve = function() {
     }
   }
   var $list = this.types.getValues();
-  for (var $i = this.types.getValues().iterator(); $i.hasNext(); ) {
-    var type = $i.next();
-    type.resolve();
+  for (var $i = this.types.getValues().iterator$0(); $i.hasNext$0(); ) {
+    var type = $i.next$0();
+    type.resolve$0();
   }
 }
 Library.prototype.visitSources = function() {
   var visitor = new _LibraryVisitor(this);
-  visitor.addSource(this.baseSource);
+  visitor.addSource$1(this.baseSource);
 }
 Library.prototype.toString = function() {
   return this.baseSource.filename;
 }
+Library.prototype.resolve$0 = function() {
+  return this.resolve();
+};
+Library.prototype.toString$0 = function() {
+  return this.toString();
+};
+Library.prototype.visitSources$0 = function() {
+  return this.visitSources();
+};
 // ********** Code for _LibraryVisitor **************
 function _LibraryVisitor(library) {
   this.seenImport = false
@@ -12549,6 +13945,7 @@ function _LibraryVisitor(library) {
   this.currentType = this.library.topType;
   this.sources = [];
 }
+_LibraryVisitor.prototype.is$TreeVisitor = function(){return this;};
 _LibraryVisitor.prototype.get$library = function() { return this.library; };
 _LibraryVisitor.prototype.get$isTop = function() { return this.isTop; };
 _LibraryVisitor.prototype.set$isTop = function(value) { return this.isTop = value; };
@@ -12581,15 +13978,15 @@ _LibraryVisitor.prototype.addSource = function(source) {
   var parser = new lang_Parser(source, options.dietParse, false, false, 0);
   var unit = parser.compilationUnit();
   unit.forEach((function (def) {
-    return def.visit($this);
+    return def.visit$1($this);
   })
   );
   $assert($notnull_bool(this.sources.length == 0 || this.isTop), "sources.length == 0 || isTop", "library.dart", 293, 12);
   this.isTop = false;
   var newSources = this.sources;
   this.sources = [];
-  for (var $i = newSources.iterator(); $i.hasNext(); ) {
-    var source0 = $i.next();
+  for (var $i = newSources.iterator$0(); $i.hasNext$0(); ) {
+    var source0 = $i.next$0();
     this.addSource((source0 && source0.is$SourceFile()));
   }
 }
@@ -12625,7 +14022,7 @@ _LibraryVisitor.prototype.visitDirectiveDefinition = function(node) {
       if (node.arguments.length > 2 || $notnull_bool(node.arguments.length == 2 && prefix == null)) {
         world.error('expected at most one "name" argument and one optional "prefix"' + (' but found ' + node.arguments.length + ''), node.span);
       }
-      else if ($notnull_bool($ne(prefix, null) && prefix.indexOf('.', 0) >= 0)) {
+      else if ($notnull_bool($ne(prefix, null) && prefix.indexOf$2('.', 0) >= 0)) {
         world.error('library prefix canot contain "."', node.span);
       }
       else if ($notnull_bool(this.seenSource || this.seenResource)) {
@@ -12698,8 +14095,8 @@ _LibraryVisitor.prototype.tryGetNamedStringArg = function(node, argName) {
   if (args.length > 1) {
     world.error(('expected at most one "' + argName + '" argument but found ') + node.arguments.length, node.span);
   }
-  for (var $i = args.iterator(); $i.hasNext(); ) {
-    var arg = $i.next();
+  for (var $i = args.iterator$0(); $i.hasNext$0(); ) {
+    var arg = $i.next$0();
     return this._parseStringArgument((arg && arg.is$ArgumentNode()));
   }
 }
@@ -12716,7 +14113,7 @@ _LibraryVisitor.prototype.visitTypeDefinition = function(node) {
   var $list = node.body;
   for (var $i = 0;$i < $list.length; $i++) {
     var member = $list.$index($i);
-    member.visit(this);
+    member.visit$1(this);
   }
   this.currentType = (oldType && oldType.is$DefinedType());
 }
@@ -12728,8 +14125,11 @@ _LibraryVisitor.prototype.visitFunctionDefinition = function(node) {
 }
 _LibraryVisitor.prototype.visitFunctionTypeDefinition = function(node) {
   var type = this.library.addType(node.func.name.name, node, false);
-  type.addMethod('\$call', node.func);
+  type.addMethod$2('\$call', node.func);
 }
+_LibraryVisitor.prototype.addSource$1 = function($0) {
+  return this.addSource(($0 && $0.is$SourceFile()));
+};
 // ********** Code for Parameter **************
 function Parameter(definition) {
   this.isInitializer = false
@@ -12787,6 +14187,15 @@ Parameter.prototype.copyWithNewType = function(newType) {
 Parameter.prototype.get$isOptional = function() {
   return this.definition != null && this.definition.value != null;
 }
+Parameter.prototype.copyWithNewType$1 = function($0) {
+  return this.copyWithNewType(($0 && $0.is$lang_Type()));
+};
+Parameter.prototype.genValue$2 = function($0, $1) {
+  return this.genValue(($0 && $0.is$MethodMember()), ($1 && $1.is$MethodGenerator()));
+};
+Parameter.prototype.resolve$2 = function($0, $1) {
+  return this.resolve(($0 && $0.is$Member()), ($1 && $1.is$lang_Type()));
+};
 // ********** Code for Member **************
 function Member(name, declaringType) {
   this.name = name;
@@ -12830,6 +14239,12 @@ Member.prototype.get$isConst = function() {
 Member.prototype.get$isFactory = function() {
   return false;
 }
+Member.prototype.get$isOperator = function() {
+  return this.name.startsWith('\$');
+}
+Member.prototype.get$isCallMethod = function() {
+  return this.name == '\$call';
+}
 Member.prototype.get$prefersPropertySyntax = function() {
   return true;
 }
@@ -12872,7 +14287,7 @@ Member.prototype.canInvoke = function(context, args) {
 }
 Member.prototype.invoke = function(context, node, target, args, isDynamic) {
   var newTarget = this._get(context, node, target, isDynamic);
-  return newTarget.invoke(context, '\$call', node, args, isDynamic);
+  return newTarget.invoke$5(context, '\$call', node, args, isDynamic);
 }
 Member.prototype.override = function(other) {
   if ($notnull_bool(this.get$isStatic())) {
@@ -12886,7 +14301,7 @@ Member.prototype.override = function(other) {
   return true;
 }
 Member.prototype.get$generatedFactoryName = function() {
-  $assert(this.get$isFactory(), "this.isFactory", "member.dart", 192, 12);
+  $assert(this.get$isFactory(), "this.isFactory", "member.dart", 195, 12);
   var prefix = ('' + this.declaringType.get$jsname() + '.' + this.get$constructorName() + '\$');
   if (this.name == '') {
     return ('' + prefix + 'factory');
@@ -12904,16 +14319,31 @@ Member.prototype.resolveType = function(node, isRequired) {
 }
 Member.prototype._get$3 = function($0, $1, $2) {
   return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()));
-}
-;
+};
 Member.prototype._set$4 = function($0, $1, $2, $3) {
   return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()));
-}
-;
+};
+Member.prototype.canInvoke$2 = function($0, $1) {
+  return this.canInvoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Arguments()));
+};
 Member.prototype.invoke$4 = function($0, $1, $2, $3) {
   return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
-}
-;
+};
+Member.prototype.invoke$4$isDynamic = function($0, $1, $2, $3, isDynamic) {
+  return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
+};
+Member.prototype.invoke$5 = function($0, $1, $2, $3, $4) {
+  return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
+};
+Member.prototype.provideFieldSyntax$0 = function() {
+  return this.provideFieldSyntax();
+};
+Member.prototype.providePropertySyntax$0 = function() {
+  return this.providePropertySyntax();
+};
+Member.prototype.resolve$1 = function($0) {
+  return this.resolve(($0 && $0.is$lang_Type()));
+};
 // ********** Code for TypeMember **************
 function TypeMember(type) {
   this.type = type;
@@ -12956,16 +14386,25 @@ TypeMember.prototype.invoke = function(context, node, target, args, isDynamic) {
 }
 TypeMember.prototype._get$3 = function($0, $1, $2) {
   return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), false);
-}
-;
+};
 TypeMember.prototype._set$4 = function($0, $1, $2, $3) {
   return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
-}
-;
+};
+TypeMember.prototype.canInvoke$2 = function($0, $1) {
+  return this.canInvoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Arguments()));
+};
 TypeMember.prototype.invoke$4 = function($0, $1, $2, $3) {
   return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
-}
-;
+};
+TypeMember.prototype.invoke$4$isDynamic = function($0, $1, $2, $3, isDynamic) {
+  return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
+};
+TypeMember.prototype.invoke$5 = function($0, $1, $2, $3, $4) {
+  return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
+};
+TypeMember.prototype.resolve$1 = function($0) {
+  return this.resolve(($0 && $0.is$lang_Type()));
+};
 // ********** Code for FieldMember **************
 function FieldMember(name, declaringType, definition, value) {
   this._providePropertySyntax = false
@@ -13118,12 +14557,22 @@ FieldMember.prototype._set = function(context, node, target, value, isDynamic) {
 }
 FieldMember.prototype._get$3 = function($0, $1, $2) {
   return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), false);
-}
-;
+};
 FieldMember.prototype._set$4 = function($0, $1, $2, $3) {
   return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
-}
-;
+};
+FieldMember.prototype.computeValue$0 = function() {
+  return this.computeValue();
+};
+FieldMember.prototype.provideFieldSyntax$0 = function() {
+  return this.provideFieldSyntax();
+};
+FieldMember.prototype.providePropertySyntax$0 = function() {
+  return this.providePropertySyntax();
+};
+FieldMember.prototype.resolve$1 = function($0) {
+  return this.resolve(($0 && $0.is$lang_Type()));
+};
 // ********** Code for PropertyMember **************
 function PropertyMember(name, declaringType) {
   this._provideFieldSyntax = false
@@ -13213,12 +14662,19 @@ PropertyMember.prototype.resolve = function(inType) {
 }
 PropertyMember.prototype._get$3 = function($0, $1, $2) {
   return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), false);
-}
-;
+};
 PropertyMember.prototype._set$4 = function($0, $1, $2, $3) {
   return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
-}
-;
+};
+PropertyMember.prototype.provideFieldSyntax$0 = function() {
+  return this.provideFieldSyntax();
+};
+PropertyMember.prototype.providePropertySyntax$0 = function() {
+  return this.providePropertySyntax();
+};
+PropertyMember.prototype.resolve$1 = function($0) {
+  return this.resolve(($0 && $0.is$lang_Type()));
+};
 // ********** Code for ConcreteMember **************
 function ConcreteMember(name, declaringType, baseMember) {
   this.baseMember = baseMember;
@@ -13229,9 +14685,9 @@ function ConcreteMember(name, declaringType, baseMember) {
   var $list = this.baseMember.get$parameters();
   for (var $i = 0;$i < $list.length; $i++) {
     var p = $list.$index($i);
-    var newType = p.type.resolveTypeParams(declaringType);
+    var newType = p.type.resolveTypeParams$1(declaringType);
     if ($notnull_bool($ne(newType, p.type))) {
-      this.parameters.add(p.copyWithNewType((newType && newType.is$lang_Type())));
+      this.parameters.add(p.copyWithNewType$1(newType));
     }
     else {
       this.parameters.add(p);
@@ -13313,8 +14769,9 @@ ConcreteMember.prototype.set$initDelegate = function(ctor) {
   this.baseMember.set$initDelegate(ctor);
 }
 ConcreteMember.prototype.resolveType = function(node, isRequired) {
+  var $0;
   var type = this.baseMember.resolveType(node, isRequired);
-  return type.resolveTypeParams(this.declaringType);
+  return (($0 = type.resolveTypeParams$1(this.declaringType)) && $0.is$lang_Type());
 }
 ConcreteMember.prototype.override = function(other) {
   return this.baseMember.override(other);
@@ -13331,23 +14788,35 @@ ConcreteMember.prototype.invoke = function(context, node, target, args, isDynami
   var ret = this.baseMember.invoke(context, node, target, args, isDynamic);
   var code = ret.code;
   if ($notnull_bool(this.get$isConstructor())) {
-    code = code.replaceFirst(this.declaringType.get$genericType().get$jsname(), this.declaringType.get$jsname());
+    code = code.replaceFirst$2(this.declaringType.get$genericType().get$jsname(), this.declaringType.get$jsname());
   }
   this.declaringType.genMethod(this);
   return new Value(this.get$inferredResult(), code, node.span, true);
 }
 ConcreteMember.prototype._get$3 = function($0, $1, $2) {
   return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), false);
-}
-;
+};
 ConcreteMember.prototype._set$4 = function($0, $1, $2, $3) {
   return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
-}
-;
+};
+ConcreteMember.prototype.canInvoke$2 = function($0, $1) {
+  return this.canInvoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Arguments()));
+};
 ConcreteMember.prototype.invoke$4 = function($0, $1, $2, $3) {
   return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
-}
-;
+};
+ConcreteMember.prototype.invoke$4$isDynamic = function($0, $1, $2, $3, isDynamic) {
+  return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
+};
+ConcreteMember.prototype.invoke$5 = function($0, $1, $2, $3, $4) {
+  return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
+};
+ConcreteMember.prototype.provideFieldSyntax$0 = function() {
+  return this.provideFieldSyntax();
+};
+ConcreteMember.prototype.providePropertySyntax$0 = function() {
+  return this.providePropertySyntax();
+};
 // ********** Code for MethodMember **************
 function MethodMember(name, declaringType, definition) {
   this.isStatic = false
@@ -13498,12 +14967,11 @@ MethodMember.prototype.namesInOrder = function(args) {
   return true;
 }
 MethodMember.prototype.needsArgumentConversion = function(args) {
-  var $0;
   var bareCount = args.get$bareCount();
   for (var i = 0;
    i < bareCount; i++) {
     var arg = args.values.$index(i);
-    if ($notnull_bool(arg.needsConversion((($0 = this.parameters.$index(i).type) && $0.is$lang_Type())))) {
+    if ($notnull_bool(arg.needsConversion$1(this.parameters.$index(i).type))) {
       return false;
     }
   }
@@ -13512,7 +14980,7 @@ MethodMember.prototype.needsArgumentConversion = function(args) {
     for (var i = bareCount;
      i < this.parameters.length; i++) {
       var arg = args.getValue($assert_String(this.parameters.$index(i).get$name()));
-      if ($notnull_bool($ne(arg, null) && arg.needsConversion((($0 = this.parameters.$index(i).type) && $0.is$lang_Type())))) {
+      if ($notnull_bool($ne(arg, null) && arg.needsConversion$1(this.parameters.$index(i).type))) {
         return false;
       }
     }
@@ -13535,11 +15003,10 @@ MethodMember.prototype.genParameterValues = function() {
   var $list = this.parameters;
   for (var $i = 0;$i < $list.length; $i++) {
     var p = $list.$index($i);
-    p.genValue(this, this.generator);
+    p.genValue$2(this, this.generator);
   }
 }
 MethodMember.prototype.invoke = function(context, node, target, args, isDynamic) {
-  var $0;
   if (this.parameters == null) {
     world.info(('surprised to need to resolve: ' + this.declaringType.name + '.' + this.name + ''));
     this.resolve(this.declaringType);
@@ -13554,7 +15021,7 @@ MethodMember.prototype.invoke = function(context, node, target, args, isDynamic)
   }
   var argsCode = [];
   if (target != null && ($notnull_bool(this.get$isConstructor() || target.isSuper))) {
-    argsCode.add('this');
+    argsCode.add$1('this');
   }
   var bareCount = args.get$bareCount();
   for (var i = 0;
@@ -13564,12 +15031,12 @@ MethodMember.prototype.invoke = function(context, node, target, args, isDynamic)
       var msg = MethodMember._argCountMsg(args.get$length(), this.parameters.length, false);
       return this._argError(context, node, target, args, $assert_String(msg));
     }
-    arg = arg.convertTo(context, (($0 = this.parameters.$index(i).type) && $0.is$lang_Type()), node, isDynamic);
+    arg = arg.convertTo$4(context, this.parameters.$index(i).type, node, isDynamic);
     if ($notnull_bool(this.isConst && arg.get$isConst())) {
-      argsCode.add(arg.get$canonicalCode());
+      argsCode.add$1(arg.get$canonicalCode());
     }
     else {
-      argsCode.add(arg.code);
+      argsCode.add$1(arg.code);
     }
   }
   if (bareCount < this.parameters.length) {
@@ -13582,7 +15049,7 @@ MethodMember.prototype.invoke = function(context, node, target, args, isDynamic)
         arg = this.parameters.$index(i).get$value();
       }
       else {
-        arg = arg.convertTo(context, (($0 = this.parameters.$index(i).type) && $0.is$lang_Type()), node, isDynamic);
+        arg = arg.convertTo$4(context, this.parameters.$index(i).type, node, isDynamic);
         namedArgsUsed++;
       }
       if ($notnull_bool(arg == null || !$notnull_bool(this.parameters.$index(i).get$isOptional()))) {
@@ -13590,7 +15057,7 @@ MethodMember.prototype.invoke = function(context, node, target, args, isDynamic)
         return this._argError(context, node, target, args, $assert_String(msg));
       }
       else {
-        argsCode.add($notnull_bool(this.isConst && arg.get$isConst()) ? arg.get$canonicalCode() : arg.code);
+        argsCode.add$1($notnull_bool(this.isConst && arg.get$isConst()) ? arg.get$canonicalCode() : arg.code);
       }
     }
     if (namedArgsUsed < args.get$nameCount()) {
@@ -13598,10 +15065,10 @@ MethodMember.prototype.invoke = function(context, node, target, args, isDynamic)
       for (var i = bareCount;
        i < args.get$length(); i++) {
         var name = args.getName(i);
-        if (seen.contains(name)) {
+        if ($notnull_bool(seen.contains$1(name))) {
           return this._argError(context, node, target, args, ('duplicate argument "' + name + '"'));
         }
-        seen.add(name);
+        seen.add$1(name);
         var p = this.indexOfParameter($assert_String(name));
         if (p < 0) {
           return this._argError(context, node, target, args, ('method does not have optional parameter "' + name + '"'));
@@ -13621,7 +15088,7 @@ MethodMember.prototype.invoke = function(context, node, target, args, isDynamic)
   if ($notnull_bool(target != null && target.isSuper)) {
     return new Value(this.get$inferredResult(), ('' + this.declaringType.get$jsname() + '.prototype.' + this.get$jsname() + '.call(' + argsString + ')'), node.span, true);
   }
-  if (this.name.startsWith('\$')) {
+  if ($notnull_bool(this.get$isOperator())) {
     return this._invokeBuiltin(context, node, target, args, argsCode, isDynamic);
   }
   if ($notnull_bool(this.isFactory)) {
@@ -13645,7 +15112,7 @@ MethodMember.prototype.invoke = function(context, node, target, args, isDynamic)
     }
     else if (this.name == 'isEmpty') {
       if ((target instanceof ConstListValue) || (target instanceof ConstMapValue)) {
-        code = ('' + target.get$dynamic().values.isEmpty() + '');
+        code = ('' + target.get$dynamic().values.isEmpty$0() + '');
       }
     }
   }
@@ -13721,8 +15188,8 @@ MethodMember.prototype._invokeConstConstructor = function(node, code, target, ar
             value = value.exp;
           }
           var $list0 = value.fields.getKeys();
-          for (var $i0 = value.fields.getKeys().iterator(); $i0.hasNext(); ) {
-            var fname = $i0.next();
+          for (var $i0 = value.fields.getKeys().iterator$0(); $i0.hasNext$0(); ) {
+            var fname = $i0.next$0();
             fields.$setindex(fname, value.fields.$index(fname));
           }
         }
@@ -13738,10 +15205,10 @@ MethodMember.prototype._invokeConstConstructor = function(node, code, target, ar
     this.generator._popBlock();
   }
   var $list = this.declaringType.get$members().getValues();
-  for (var $i = this.declaringType.get$members().getValues().iterator(); $i.hasNext(); ) {
-    var f = $i.next();
+  for (var $i = this.declaringType.get$members().getValues().iterator$0(); $i.hasNext$0(); ) {
+    var f = $i.next$0();
     if ($notnull_bool((f instanceof FieldMember) && !$notnull_bool(f.get$isStatic()) && $ne(f.get$value(), null)) && !fields.containsKey(f.get$name())) {
-      fields.$setindex(f.get$name(), f.computeValue());
+      fields.$setindex(f.get$name(), f.computeValue$0());
     }
   }
   return world.gen.globalForConst(ConstObjectValue.ConstObjectValue$factory(this.declaringType, fields, code, node.span), args.values);
@@ -13891,13 +15358,13 @@ MethodMember.prototype._invokeBuiltin = function(context, node, target, args, ar
     else if (this.name == '\$add') {
       if ($notnull_bool(allConst)) {
         var val0 = target.get$dynamic().get$actualValue();
-        val0 = val0.substring(1, val0.length - 1);
+        val0 = val0.substring$2(1, val0.length - 1);
         var val1 = args.values.$index(0).get$dynamic().get$actualValue();
         if ($notnull_bool(args.values.$index(0).type.get$isString())) {
-          val1 = val1.substring(1, val1.length - 1);
+          val1 = val1.substring$2(1, val1.length - 1);
         }
         var value = ('' + val0 + '' + val1 + '');
-        value = '"' + value.replaceAll('"', '\\"') + '"';
+        value = '"' + value.replaceAll$2('"', '\\"') + '"';
         return EvaluatedValue.EvaluatedValue$factory(world.stringType, value, $assert_String(value), node.span);
       }
       args.values.$index(0).invoke$4(context, 'toString', node, Arguments.get$EMPTY());
@@ -13932,7 +15399,7 @@ MethodMember.prototype._invokeBuiltin = function(context, node, target, args, ar
     world.gen.corejs.useOperator(this.name);
     return new Value(this.get$inferredResult(), ('' + this.name + '(' + target.code + ', ' + argsCode.$index(0) + ')'), node.span, true);
   }
-  if (this.name == '\$call') {
+  if ($notnull_bool(this.get$isCallMethod())) {
     this.declaringType.markUsed();
     return new Value(this.get$inferredResult(), ('' + target.code + '(' + Strings.join((argsCode && argsCode.is$List$String()), ", ") + ')'), node.span, true);
   }
@@ -13991,7 +15458,7 @@ MethodMember.prototype.resolve = function(inType) {
   if ($notnull_bool(this.isFactory)) {
     this.isStatic = true;
   }
-  if ($notnull_bool(this.name.startsWith('\$') && !this.name.startsWith('\$call') && this.isStatic)) {
+  if ($notnull_bool(this.get$isOperator() && this.isStatic) && !$notnull_bool(this.get$isCallMethod())) {
     world.error(('operator method may not be static "' + this.name + '"'), this.get$span());
   }
   if ($notnull_bool(this.isAbstract)) {
@@ -14021,7 +15488,7 @@ MethodMember.prototype.resolve = function(inType) {
   for (var $i = 0;$i < $list.length; $i++) {
     var formal = $list.$index($i);
     var param = new Parameter(formal);
-    param.resolve(this, inType);
+    param.resolve$2(this, inType);
     this.parameters.add(param);
   }
   if (!$notnull_bool(this.isLambda)) {
@@ -14030,27 +15497,47 @@ MethodMember.prototype.resolve = function(inType) {
 }
 MethodMember.prototype._get$3 = function($0, $1, $2) {
   return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), false);
-}
-;
+};
 MethodMember.prototype._set$4 = function($0, $1, $2, $3) {
   return this._set(($0 && $0.is$MethodGenerator()), $1, ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
-}
-;
+};
+MethodMember.prototype.canInvoke$2 = function($0, $1) {
+  return this.canInvoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Arguments()));
+};
 MethodMember.prototype.invoke$4 = function($0, $1, $2, $3) {
   return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
-}
-;
+};
+MethodMember.prototype.invoke$4$isDynamic = function($0, $1, $2, $3, isDynamic) {
+  return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
+};
+MethodMember.prototype.invoke$5 = function($0, $1, $2, $3, $4) {
+  return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
+};
+MethodMember.prototype.namesInOrder$1 = function($0) {
+  return this.namesInOrder(($0 && $0.is$Arguments()));
+};
+MethodMember.prototype.provideFieldSyntax$0 = function() {
+  return this.provideFieldSyntax();
+};
+MethodMember.prototype.providePropertySyntax$0 = function() {
+  return this.providePropertySyntax();
+};
+MethodMember.prototype.resolve$1 = function($0) {
+  return this.resolve(($0 && $0.is$lang_Type()));
+};
 // ********** Code for MemberSet **************
-function MemberSet(member) {
+function MemberSet(member, isVar) {
   this.name = member.name;
   this.members = [member];
   this.jsname = member.get$jsname();
+  this.isVar = isVar;
   // Initializers done
 }
 MemberSet.prototype.is$MemberSet = function(){return this;};
 MemberSet.prototype.get$name = function() { return this.name; };
 MemberSet.prototype.get$members = function() { return this.members; };
 MemberSet.prototype.get$jsname = function() { return this.jsname; };
+MemberSet.prototype.get$isVar = function() { return this.isVar; };
 MemberSet.prototype.toString = function() {
   return ('' + this.name + ':' + this.members.length + '');
 }
@@ -14066,9 +15553,12 @@ MemberSet.prototype.add = function(member) {
 MemberSet.prototype.get$isStatic = function() {
   return $notnull_bool(this.members.length == 1 && this.members.$index(0).get$isStatic());
 }
+MemberSet.prototype.get$isOperator = function() {
+  return this.members.$index(0).get$isOperator();
+}
 MemberSet.prototype.canInvoke = function(context, args) {
   return this.members.some((function (m) {
-    return m.canInvoke(context, args);
+    return m.canInvoke$2(context, args);
   })
   );
 }
@@ -14096,10 +15586,10 @@ MemberSet.prototype.get$treatAsField = function() {
     for (var $i = 0;$i < $list.length; $i++) {
       var member = $list.$index($i);
       if ($notnull_bool(this._treatAsField)) {
-        member.provideFieldSyntax();
+        member.provideFieldSyntax$0();
       }
       else {
-        member.providePropertySyntax();
+        member.providePropertySyntax$0();
       }
     }
   }
@@ -14117,8 +15607,8 @@ MemberSet.prototype._get = function(context, node, target, isDynamic) {
     return targets.$index(0)._get(context, node, target, isDynamic);
   }
   var returnValue = null;
-  for (var $i = targets.iterator(); $i.hasNext(); ) {
-    var member = $i.next();
+  for (var $i = targets.iterator$0(); $i.hasNext$0(); ) {
+    var member = $i.next$0();
     var value = member._get(context, node, target, true);
     returnValue = this._tryUnion(returnValue, value, node);
   }
@@ -14147,8 +15637,8 @@ MemberSet.prototype._set = function(context, node, target, value, isDynamic) {
     return targets.$index(0)._set(context, node, target, value, isDynamic);
   }
   var returnValue = null;
-  for (var $i = targets.iterator(); $i.hasNext(); ) {
-    var member = $i.next();
+  for (var $i = targets.iterator$0(); $i.hasNext$0(); ) {
+    var member = $i.next$0();
     var res = member._set(context, node, target, value, true);
     returnValue = this._tryUnion(returnValue, res, node);
   }
@@ -14166,27 +15656,31 @@ MemberSet.prototype._set = function(context, node, target, value, isDynamic) {
   return returnValue;
 }
 MemberSet.prototype.invoke = function(context, node, target, args, isDynamic) {
+  var $0;
+  if ($notnull_bool(this.isVar && !$notnull_bool(this.get$isOperator()))) {
+    return this.invokeOnVar(context, node, target, args);
+  }
   if (this.members.length == 1) {
-    return this.members.$index(0).invoke(context, node, target, args, isDynamic);
+    return this.members.$index(0).invoke$5(context, node, target, args, isDynamic);
   }
   var targets = this.members.filter((function (m) {
-    return m.canInvoke(context, args);
+    return m.canInvoke$2(context, args);
   })
   );
   if (targets.length == 1) {
-    return targets.$index(0).invoke(context, node, target, args, isDynamic);
+    return (($0 = targets.$index(0).invoke$5(context, node, target, args, isDynamic)) && $0.is$Value());
   }
   var returnValue = null;
-  for (var $i = targets.iterator(); $i.hasNext(); ) {
-    var member = $i.next();
-    var res = member.invoke(context, node, target, args, true);
+  for (var $i = targets.iterator$0(); $i.hasNext$0(); ) {
+    var member = $i.next$0();
+    var res = member.invoke$4$isDynamic(context, node, target, args, true);
     returnValue = this._tryUnion(returnValue, res, node);
   }
   if (returnValue == null) {
     return this._makeError(node, target, 'method');
   }
   if (returnValue.code == null) {
-    if (this.name.startsWith('\$')) {
+    if ($notnull_bool(this.get$isOperator())) {
       return target.invokeSpecial(this.name, args, returnValue.type);
     }
     else {
@@ -14196,7 +15690,8 @@ MemberSet.prototype.invoke = function(context, node, target, args, isDynamic) {
   return returnValue;
 }
 MemberSet.prototype.invokeOnVar = function(context, node, target, args) {
-  return this.getVarMember(context, node, args).invoke(context, node, target, args);
+  var member = this.getVarMember(context, node, args);
+  return member.invoke$4(context, node, target, args);
 }
 MemberSet.prototype._tryUnion = function(x, y, node) {
   if (x == null) return y;
@@ -14229,7 +15724,7 @@ MemberSet.prototype.getVarMember = function(context, node, args) {
   if ($notnull_bool(stub == null)) {
     var mset = context.findMembers(this.name).members;
     var targets = mset.filter((function (m) {
-      return m.canInvoke(context, args);
+      return m.canInvoke$2(context, args);
     })
     );
     var returnType = reduce(map((targets && targets.is$Iterable()), (function (t) {
@@ -14243,16 +15738,28 @@ MemberSet.prototype.getVarMember = function(context, node, args) {
 }
 MemberSet.prototype._get$3 = function($0, $1, $2) {
   return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), false);
-}
-;
+};
 MemberSet.prototype._set$4 = function($0, $1, $2, $3) {
   return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
-}
-;
+};
+MemberSet.prototype.add$1 = function($0) {
+  return this.add(($0 && $0.is$Member()));
+};
+MemberSet.prototype.canInvoke$2 = function($0, $1) {
+  return this.canInvoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Arguments()));
+};
 MemberSet.prototype.invoke$4 = function($0, $1, $2, $3) {
   return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
-}
-;
+};
+MemberSet.prototype.invoke$4$isDynamic = function($0, $1, $2, $3, isDynamic) {
+  return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
+};
+MemberSet.prototype.invoke$5 = function($0, $1, $2, $3, $4) {
+  return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
+};
+MemberSet.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for FactoryMap **************
 function FactoryMap() {
   this.factories = $map([]);
@@ -14298,7 +15805,7 @@ lang_Token.prototype.toString = function() {
   var actualText = this.get$text();
   if ($notnull_bool($ne(kindText, actualText))) {
     if (actualText.length > 10) {
-      actualText = actualText.substring(0, 8) + '...';
+      actualText = actualText.substring$2(0, 8) + '...';
     }
     return ('' + kindText + '(' + actualText + ')');
   }
@@ -14309,6 +15816,9 @@ lang_Token.prototype.toString = function() {
 lang_Token.prototype.get$span = function() {
   return new SourceSpan(this.source, this.start, this.end);
 }
+lang_Token.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for SourceFile **************
 function SourceFile(filename, _text) {
   this.filename = filename;
@@ -14316,6 +15826,7 @@ function SourceFile(filename, _text) {
   // Initializers done
 }
 SourceFile.prototype.is$SourceFile = function(){return this;};
+SourceFile.prototype.is$Comparable = function(){return this;};
 SourceFile.prototype.get$text = function() {
   return this._text;
 }
@@ -14326,9 +15837,9 @@ SourceFile.prototype.get$lineStarts = function() {
     while (index < this.get$text().length) {
       index = this.get$text().indexOf('\n', index) + 1;
       if (index <= 0) break;
-      starts.add(index);
+      starts.add$1(index);
     }
-    starts.add(this.get$text().length + 1);
+    starts.add$1(this.get$text().length + 1);
     this._lineStarts = (starts && starts.is$List$int());
   }
   return this._lineStarts;
@@ -14349,7 +15860,7 @@ SourceFile.prototype.getLocationMessage = function(message, start, end, includeT
   var column = this.getColumn($assert_num(line), start);
   var buf = new StringBufferImpl(('' + this.filename + ':' + (line + 1) + ':' + (column + 1) + ': ' + message + ''));
   if ($notnull_bool(includeText)) {
-    buf.add('\n');
+    buf.add$1('\n');
     var textLine;
     if ((line + 2) < this._lineStarts.length) {
       textLine = this.get$text().substring(this._lineStarts.$index(line), this._lineStarts.$index(line + 1));
@@ -14357,17 +15868,17 @@ SourceFile.prototype.getLocationMessage = function(message, start, end, includeT
     else {
       textLine = this.get$text().substring(this._lineStarts.$index(line)) + '\n';
     }
-    buf.add(textLine);
+    buf.add$1(textLine);
     var i = 0;
     for (; i < $assert_num(column); i++) {
-      buf.add(' ');
+      buf.add$1(' ');
     }
     var toColumn = Math.min($assert_num(column + (end - start)), textLine.length);
     for (; i < toColumn; i++) {
-      buf.add('^');
+      buf.add$1('^');
     }
   }
-  return $assert_String(buf.toString());
+  return buf.toString$0();
 }
 SourceFile.prototype.compareTo = function(other) {
   if (this.orderInLibrary != null && other.orderInLibrary != null) {
@@ -14377,6 +15888,9 @@ SourceFile.prototype.compareTo = function(other) {
     return this.filename.compareTo(other.filename);
   }
 }
+SourceFile.prototype.compareTo$1 = function($0) {
+  return this.compareTo(($0 && $0.is$SourceFile()));
+};
 // ********** Code for SourceSpan **************
 function SourceSpan(file, start, end) {
   this.file = file;
@@ -14385,6 +15899,7 @@ function SourceSpan(file, start, end) {
   // Initializers done
 }
 SourceSpan.prototype.is$SourceSpan = function(){return this;};
+SourceSpan.prototype.is$Comparable = function(){return this;};
 SourceSpan.prototype.get$text = function() {
   return this.file.get$text().substring(this.start, this.end);
 }
@@ -14403,6 +15918,9 @@ SourceSpan.prototype.compareTo = function(other) {
   }
   return this.file.compareTo(other.file);
 }
+SourceSpan.prototype.compareTo$1 = function($0) {
+  return this.compareTo(($0 && $0.is$SourceSpan()));
+};
 // ********** Code for InterpStack **************
 function InterpStack(previous, quote, isMultiline) {
   this.previous = previous;
@@ -14420,6 +15938,9 @@ InterpStack.push = function(stack, quote, isMultiline) {
   if (stack != null) newStack.previous = stack;
   return (newStack && newStack.is$InterpStack());
 }
+InterpStack.prototype.next$0 = function() {
+  return this.next();
+};
 // ********** Code for TokenizerBase **************
 function TokenizerBase(_source, _skipWhitespace, _index) {
   this._source = _source;
@@ -14751,6 +16272,9 @@ TokenizerBase.prototype.finishIdentifier = function() {
     return this._finishToken(kind);
   }
 }
+TokenizerBase.prototype.next$0 = function() {
+  return this.next();
+};
 // ********** Code for Tokenizer **************
 function Tokenizer(source, skipWhitespace, index) {
   TokenizerBase.call(this, source, skipWhitespace, index);
@@ -15278,6 +16802,9 @@ Tokenizer.prototype.getIdentifierKind = function() {
 
   }
 }
+Tokenizer.prototype.next$0 = function() {
+  return this.next();
+};
 // ********** Code for TokenizerHelpers **************
 function TokenizerHelpers() {}
 TokenizerHelpers.isIdentifierStart = function(c) {
@@ -16193,10 +17720,10 @@ lang_Parser.prototype.compilationUnit = function() {
   var ret = [];
   this._maybeEat(13/*TokenKind.HASHBANG*/);
   while ($notnull_bool(this._peekKind(12/*TokenKind.HASH*/))) {
-    ret.add(this.directive());
+    ret.add$1(this.directive());
   }
   while (!$notnull_bool(this._maybeEat(1/*TokenKind.END_OF_FILE*/))) {
-    ret.add(this.topLevelDefinition());
+    ret.add$1(this.topLevelDefinition());
   }
   return (ret && ret.is$List$Definition());
 }
@@ -16256,7 +17783,7 @@ lang_Parser.prototype.classDefinition = function(kind) {
   if ($notnull_bool(this._maybeEat(6/*TokenKind.LBRACE*/))) {
     while (!$notnull_bool(this._maybeEat(7/*TokenKind.RBRACE*/))) {
       if ($notnull_bool(this.isPrematureEndOfFile())) break;
-      body.add(this.declaration(true));
+      body.add$1(this.declaration(true));
     }
   }
   else {
@@ -16281,7 +17808,7 @@ lang_Parser.prototype.initializers = function() {
   this._inInitializers = true;
   var ret = [];
   do {
-    ret.add(this.expression());
+    ret.add$1(this.expression());
   }
   while ($notnull_bool(this._maybeEat(11/*TokenKind.COMMA*/)))
   this._inInitializers = false;
@@ -16326,12 +17853,12 @@ lang_Parser.prototype.finishField = function(start, modifiers, type, name, value
   var names = [name];
   var values = [value];
   while ($notnull_bool(this._maybeEat(11/*TokenKind.COMMA*/))) {
-    names.add(this.identifier());
+    names.add$1(this.identifier());
     if ($notnull_bool(this._maybeEat(20/*TokenKind.ASSIGN*/))) {
-      values.add(this.expression());
+      values.add$1(this.expression());
     }
     else {
-      values.add(null);
+      values.add$1();
     }
   }
   this._eatSemicolon();
@@ -16383,7 +17910,7 @@ lang_Parser.prototype.factoryConstructorDeclaration = function() {
   var factoryToken = this._lang_next();
   var names = [this.identifier()];
   while ($notnull_bool(this._maybeEat(14/*TokenKind.DOT*/))) {
-    names.add(this.identifier());
+    names.add$1(this.identifier());
   }
   var typeParams = null;
   if ($notnull_bool(this._peekKind(52/*TokenKind.LT*/))) {
@@ -16396,7 +17923,7 @@ lang_Parser.prototype.factoryConstructorDeclaration = function() {
   }
   else if ($notnull_bool(typeParams == null)) {
     if (names.length > 1) {
-      name = names.removeLast();
+      name = names.removeLast$0();
     }
     else {
       name = new lang_Identifier('', names.$index(0).get$span());
@@ -16534,7 +18061,7 @@ lang_Parser.prototype.block = function() {
   var stmts = [];
   while (!$notnull_bool(this._maybeEat(7/*TokenKind.RBRACE*/))) {
     if ($notnull_bool(this.isPrematureEndOfFile())) break;
-    stmts.add(this.statement());
+    stmts.add$1(this.statement());
   }
   return new BlockStatement(stmts, this._makeSpan(start));
 }
@@ -16585,9 +18112,9 @@ lang_Parser.prototype.forStatement = function() {
   }
   var step = [];
   if (!$notnull_bool(this._maybeEat(3/*TokenKind.RPAREN*/))) {
-    step.add(this.expression());
+    step.add$1(this.expression());
     while ($notnull_bool(this._maybeEat(11/*TokenKind.COMMA*/))) {
-      step.add(this.expression());
+      step.add$1(this.expression());
     }
     this._eat(3/*TokenKind.RPAREN*/);
   }
@@ -16629,7 +18156,7 @@ lang_Parser.prototype.tryStatement = function() {
   var body = this.block();
   var catches = [];
   while ($notnull_bool(this._peekKind(90/*TokenKind.CATCH*/))) {
-    catches.add(this.catchNode());
+    catches.add$1(this.catchNode());
   }
   var finallyBlock = null;
   if ($notnull_bool(this._maybeEat(98/*TokenKind.FINALLY*/))) {
@@ -16657,7 +18184,7 @@ lang_Parser.prototype.switchStatement = function() {
   var cases = [];
   this._eat(6/*TokenKind.LBRACE*/);
   while (!$notnull_bool(this._maybeEat(7/*TokenKind.RBRACE*/))) {
-    cases.add(this.caseNode());
+    cases.add$1(this.caseNode());
   }
   return new SwitchStatement(test, cases, this._makeSpan(start));
 }
@@ -16675,11 +18202,11 @@ lang_Parser.prototype.caseNode = function() {
   var cases = [];
   while (true) {
     if ($notnull_bool(this._maybeEat(89/*TokenKind.CASE*/))) {
-      cases.add(this.expression());
+      cases.add$1(this.expression());
       this._eat(8/*TokenKind.COLON*/);
     }
     else if ($notnull_bool(this._maybeEat(93/*TokenKind.DEFAULT*/))) {
-      cases.add(null);
+      cases.add$1();
       this._eat(8/*TokenKind.COLON*/);
     }
     else {
@@ -16692,7 +18219,7 @@ lang_Parser.prototype.caseNode = function() {
   var stmts = [];
   while (!$notnull_bool(this._peekCaseEnd())) {
     if ($notnull_bool(this.isPrematureEndOfFile())) break;
-    stmts.add(this.statement());
+    stmts.add$1(this.statement());
   }
   return new CaseNode(label, cases, stmts, this._makeSpan(start));
 }
@@ -16887,7 +18414,7 @@ lang_Parser.prototype.arguments = function() {
   this._eat(2/*TokenKind.LPAREN*/);
   if (!$notnull_bool(this._maybeEat(3/*TokenKind.RPAREN*/))) {
     do {
-      args.add(this.argument());
+      args.add$1(this.argument());
     }
     while ($notnull_bool(this._maybeEat(11/*TokenKind.COMMA*/)))
     this._eat(3/*TokenKind.RPAREN*/);
@@ -17069,25 +18596,25 @@ lang_Parser.prototype.stringInterpolation = function() {
     var text = token.get$text();
     if ($notnull_bool(startQuote == null)) {
       if ($notnull_bool(isMultilineString($assert_String(text)))) {
-        endQuote = text.substring(0, 3);
+        endQuote = text.substring$2(0, 3);
         startQuote = endQuote + '\n';
       }
       else {
         startQuote = endQuote = text.$index(0);
       }
-      text = text.substring(0, text.length - 1) + endQuote;
+      text = text.substring$2(0, text.length - 1) + endQuote;
     }
     else {
-      text = startQuote + text.substring(0, text.length - 1) + endQuote;
+      text = startQuote + text.substring$2(0, text.length - 1) + endQuote;
     }
-    lits.add(this.makeStringLiteral($assert_String(text), token.get$span()));
+    lits.add$1(this.makeStringLiteral($assert_String(text), token.get$span()));
     if ($notnull_bool(this._maybeEat(6/*TokenKind.LBRACE*/))) {
-      lits.add(this.expression());
+      lits.add$1(this.expression());
       this._eat(7/*TokenKind.RBRACE*/);
     }
     else {
       var id = this.identifier();
-      lits.add(new VarExpression(id, id.get$span()));
+      lits.add$1(new VarExpression(id, id.get$span()));
     }
   }
   var tok = this._lang_next();
@@ -17095,7 +18622,7 @@ lang_Parser.prototype.stringInterpolation = function() {
     this._errorExpected('interpolated string');
   }
   var text = startQuote + tok.get$text();
-  lits.add(this.makeStringLiteral($assert_String(text), tok.get$span()));
+  lits.add$1(this.makeStringLiteral($assert_String(text), tok.get$span()));
   var span = this._makeSpan(start);
   return new LiteralExpression(lits, this._stringTypeRef((span && span.is$SourceSpan())), '\$\$\$', (span && span.is$SourceSpan()));
 }
@@ -17274,7 +18801,7 @@ lang_Parser.prototype.finishListLiteral = function(start, isConst, type) {
   this._eat(4/*TokenKind.LBRACK*/);
   while (!$notnull_bool(this._maybeEat(5/*TokenKind.RBRACK*/))) {
     if ($notnull_bool(this.isPrematureEndOfFile())) break;
-    values.add(this.expression());
+    values.add$1(this.expression());
     if (!$notnull_bool(this._maybeEat(11/*TokenKind.COMMA*/))) {
       this._eat(5/*TokenKind.RBRACK*/);
       break;
@@ -17287,9 +18814,9 @@ lang_Parser.prototype.finishMapLiteral = function(start, isConst, type) {
   this._eat(6/*TokenKind.LBRACE*/);
   while (!$notnull_bool(this._maybeEat(7/*TokenKind.RBRACE*/))) {
     if ($notnull_bool(this.isPrematureEndOfFile())) break;
-    items.add(this.expression());
+    items.add$1(this.expression());
     this._eat(8/*TokenKind.COLON*/);
-    items.add(this.expression());
+    items.add$1(this.expression());
     if (!$notnull_bool(this._maybeEat(11/*TokenKind.COMMA*/))) {
       this._eat(7/*TokenKind.RBRACE*/);
       break;
@@ -17322,7 +18849,7 @@ lang_Parser.prototype._readModifiers = function() {
       case 75/*TokenKind.FACTORY*/:
 
         if (modifiers == null) modifiers = [];
-        modifiers.add(this._lang_next());
+        modifiers.add$1(this._lang_next());
         break;
 
       default:
@@ -17348,7 +18875,7 @@ lang_Parser.prototype.typeParameters = function() {
   var ret = [];
   do {
     var tp = this.typeParameter();
-    ret.add(tp);
+    ret.add$1(tp);
     if ((tp.extendsType instanceof GenericTypeReference) && tp.extendsType.depth == 0) {
       closed = true;
       break;
@@ -17386,7 +18913,7 @@ lang_Parser.prototype._finishTypeArguments = function(baseType, depth, types) {
   var delta = -1;
   do {
     var myType = this.type(depth + 1);
-    types.add(myType);
+    types.add$1(myType);
     if ((myType instanceof GenericTypeReference) && myType.depth <= depth) {
       delta = depth - myType.depth;
       break;
@@ -17405,7 +18932,7 @@ lang_Parser.prototype._finishTypeArguments = function(baseType, depth, types) {
 lang_Parser.prototype.typeList = function() {
   var types = [];
   do {
-    types.add(this.type(0));
+    types.add$1(this.type(0));
   }
   while ($notnull_bool(this._maybeEat(11/*TokenKind.COMMA*/)))
   return types;
@@ -17440,7 +18967,7 @@ lang_Parser.prototype.type = function(depth) {
   }
   while ($notnull_bool(this._maybeEat(14/*TokenKind.DOT*/))) {
     if (names == null) names = [];
-    names.add(this.identifier());
+    names.add$1(this.identifier());
   }
   var typeRef = new NameTypeReference(isFinal, name, names, this._makeSpan(start));
   if ($notnull_bool(this._peekKind(52/*TokenKind.LT*/))) {
@@ -17482,7 +19009,7 @@ lang_Parser.prototype.formalParameterList = function() {
     if ($notnull_bool(this._maybeEat(4/*TokenKind.LBRACK*/))) {
       inOptionalBlock = true;
     }
-    formals.add(this.formalParameter($assert_bool(inOptionalBlock)));
+    formals.add$1(this.formalParameter($assert_bool(inOptionalBlock)));
     while ($notnull_bool(this._maybeEat(11/*TokenKind.COMMA*/))) {
       if ($notnull_bool(this._maybeEat(4/*TokenKind.LBRACK*/))) {
         if ($notnull_bool(inOptionalBlock)) {
@@ -17490,7 +19017,7 @@ lang_Parser.prototype.formalParameterList = function() {
         }
         inOptionalBlock = true;
       }
-      formals.add(this.formalParameter($assert_bool(inOptionalBlock)));
+      formals.add$1(this.formalParameter($assert_bool(inOptionalBlock)));
     }
     if ($notnull_bool(inOptionalBlock)) {
       this._eat(5/*TokenKind.RBRACK*/);
@@ -17568,7 +19095,7 @@ lang_Parser.prototype._makeFormals = function(arguments) {
     if (arg.label != null) {
       this._lang_error('expected formal, but found ":"');
     }
-    expressions.add(arg.get$value());
+    expressions.add$1(arg.get$value());
   }
   return this._makeFormalsFromExpressions(expressions, true);
 }
@@ -17585,7 +19112,7 @@ lang_Parser.prototype._makeFormalsFromExpressions = function(expressions, allowO
       while (i < expressions.length) {
         var expr = expressions.$index(i++);
         if ($notnull_bool(this._isBin(expr, 53/*TokenKind.GT*/))) {
-          typeParams.add(this._makeType(expr.x));
+          typeParams.add$1(this._makeType(expr.x));
           var type = new GenericTypeReference(baseType, typeParams, 0, this._makeSpan(baseType.get$span().start));
           var name = null;
           if ((expr.y instanceof VarExpression)) {
@@ -17599,19 +19126,19 @@ lang_Parser.prototype._makeFormalsFromExpressions = function(expressions, allowO
           break;
         }
         else {
-          typeParams.add(this._makeType(expr));
+          typeParams.add$1(this._makeType(expr));
         }
       }
-      formals.add(formal);
+      formals.add$1(formal);
     }
     else if (!!(formal && formal.is$List)) {
-      formals.addAll(formal);
+      formals.addAll$1(formal);
       if (!$notnull_bool(allowOptional)) {
         this._lang_error('unexpected nested optional formal', expressions.$index(i).get$span());
       }
     }
     else {
-      formals.add(formal);
+      formals.add$1(formal);
     }
   }
   return formals;
@@ -17637,6 +19164,9 @@ lang_Parser.prototype._makeLabel = function(expr) {
     return null;
   }
 }
+lang_Parser.prototype.block$0 = function() {
+  return this.block();
+};
 // ********** Code for IncompleteSourceException **************
 function IncompleteSourceException(token) {
   this.token = token;
@@ -17646,6 +19176,9 @@ IncompleteSourceException.prototype.toString = function() {
   if (this.token.get$span() == null) return ('Unexpected ' + this.token + '');
   return $assert_String(this.token.get$span().toMessageString(('Unexpected ' + this.token + '')));
 }
+IncompleteSourceException.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for lang_Node **************
 function lang_Node(span) {
   this.span = span;
@@ -17654,6 +19187,9 @@ function lang_Node(span) {
 lang_Node.prototype.is$lang_Node = function(){return this;};
 lang_Node.prototype.get$span = function() { return this.span; };
 lang_Node.prototype.set$span = function(value) { return this.span = value; };
+lang_Node.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for Definition **************
 function Definition(span) {
   lang_Statement.call(this, span);
@@ -17692,6 +19228,9 @@ TypeReference.prototype.is$TypeReference = function(){return this;};
 TypeReference.prototype.visit = function(visitor) {
   return visitor.visitTypeReference(this);
 }
+TypeReference.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for DirectiveDefinition **************
 function DirectiveDefinition(name, arguments, span) {
   this.name = name;
@@ -17707,6 +19246,9 @@ DirectiveDefinition.prototype.set$arguments = function(value) { return this.argu
 DirectiveDefinition.prototype.visit = function(visitor) {
   return visitor.visitDirectiveDefinition(this);
 }
+DirectiveDefinition.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for TypeDefinition **************
 function TypeDefinition(isClass, name, typeParameters, extendsTypes, implementsTypes, nativeType, factoryType, body, span) {
   this.isClass = isClass;
@@ -17733,6 +19275,9 @@ TypeDefinition.prototype.set$nativeType = function(value) { return this.nativeTy
 TypeDefinition.prototype.visit = function(visitor) {
   return visitor.visitTypeDefinition(this);
 }
+TypeDefinition.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for FunctionTypeDefinition **************
 function FunctionTypeDefinition(func, typeParameters, span) {
   this.func = func;
@@ -17746,6 +19291,9 @@ FunctionTypeDefinition.prototype.set$typeParameters = function(value) { return t
 FunctionTypeDefinition.prototype.visit = function(visitor) {
   return visitor.visitFunctionTypeDefinition(this);
 }
+FunctionTypeDefinition.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for VariableDefinition **************
 function VariableDefinition(modifiers, type, names, values, span) {
   this.modifiers = modifiers;
@@ -17759,6 +19307,9 @@ $inherits(VariableDefinition, Definition);
 VariableDefinition.prototype.visit = function(visitor) {
   return visitor.visitVariableDefinition(this);
 }
+VariableDefinition.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for FunctionDefinition **************
 function FunctionDefinition(modifiers, returnType, name, formals, initializers, body, span) {
   this.modifiers = modifiers;
@@ -17779,6 +19330,9 @@ FunctionDefinition.prototype.set$name = function(value) { return this.name = val
 FunctionDefinition.prototype.visit = function(visitor) {
   return visitor.visitFunctionDefinition(this);
 }
+FunctionDefinition.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for ReturnStatement **************
 function ReturnStatement(value, span) {
   this.value = value;
@@ -17791,6 +19345,9 @@ ReturnStatement.prototype.set$value = function(value) { return this.value = valu
 ReturnStatement.prototype.visit = function(visitor) {
   return visitor.visitReturnStatement(this);
 }
+ReturnStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for ThrowStatement **************
 function ThrowStatement(value, span) {
   this.value = value;
@@ -17803,6 +19360,9 @@ ThrowStatement.prototype.set$value = function(value) { return this.value = value
 ThrowStatement.prototype.visit = function(visitor) {
   return visitor.visitThrowStatement(this);
 }
+ThrowStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for AssertStatement **************
 function AssertStatement(test, span) {
   this.test = test;
@@ -17813,6 +19373,9 @@ $inherits(AssertStatement, lang_Statement);
 AssertStatement.prototype.visit = function(visitor) {
   return visitor.visitAssertStatement(this);
 }
+AssertStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for BreakStatement **************
 function BreakStatement(label, span) {
   this.label = label;
@@ -17823,6 +19386,9 @@ $inherits(BreakStatement, lang_Statement);
 BreakStatement.prototype.visit = function(visitor) {
   return visitor.visitBreakStatement(this);
 }
+BreakStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for ContinueStatement **************
 function ContinueStatement(label, span) {
   this.label = label;
@@ -17833,6 +19399,9 @@ $inherits(ContinueStatement, lang_Statement);
 ContinueStatement.prototype.visit = function(visitor) {
   return visitor.visitContinueStatement(this);
 }
+ContinueStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for IfStatement **************
 function IfStatement(test, trueBranch, falseBranch, span) {
   this.test = test;
@@ -17845,6 +19414,9 @@ $inherits(IfStatement, lang_Statement);
 IfStatement.prototype.visit = function(visitor) {
   return visitor.visitIfStatement(this);
 }
+IfStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for WhileStatement **************
 function WhileStatement(test, body, span) {
   this.test = test;
@@ -17856,6 +19428,9 @@ $inherits(WhileStatement, lang_Statement);
 WhileStatement.prototype.visit = function(visitor) {
   return visitor.visitWhileStatement(this);
 }
+WhileStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for DoStatement **************
 function DoStatement(body, test, span) {
   this.body = body;
@@ -17867,6 +19442,9 @@ $inherits(DoStatement, lang_Statement);
 DoStatement.prototype.visit = function(visitor) {
   return visitor.visitDoStatement(this);
 }
+DoStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for ForStatement **************
 function ForStatement(init, test, step, body, span) {
   this.init = init;
@@ -17880,6 +19458,9 @@ $inherits(ForStatement, lang_Statement);
 ForStatement.prototype.visit = function(visitor) {
   return visitor.visitForStatement(this);
 }
+ForStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for ForInStatement **************
 function ForInStatement(item, list, body, span) {
   this.item = item;
@@ -17892,6 +19473,9 @@ $inherits(ForInStatement, lang_Statement);
 ForInStatement.prototype.visit = function(visitor) {
   return visitor.visitForInStatement(this);
 }
+ForInStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for TryStatement **************
 function TryStatement(body, catches, finallyBlock, span) {
   this.body = body;
@@ -17904,6 +19488,9 @@ $inherits(TryStatement, lang_Statement);
 TryStatement.prototype.visit = function(visitor) {
   return visitor.visitTryStatement(this);
 }
+TryStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for SwitchStatement **************
 function SwitchStatement(test, cases, span) {
   this.test = test;
@@ -17915,6 +19502,9 @@ $inherits(SwitchStatement, lang_Statement);
 SwitchStatement.prototype.visit = function(visitor) {
   return visitor.visitSwitchStatement(this);
 }
+SwitchStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for BlockStatement **************
 function BlockStatement(body, span) {
   this.body = body;
@@ -17926,6 +19516,9 @@ BlockStatement.prototype.is$BlockStatement = function(){return this;};
 BlockStatement.prototype.visit = function(visitor) {
   return visitor.visitBlockStatement(this);
 }
+BlockStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for LabeledStatement **************
 function LabeledStatement(name, body, span) {
   this.name = name;
@@ -17939,6 +19532,9 @@ LabeledStatement.prototype.set$name = function(value) { return this.name = value
 LabeledStatement.prototype.visit = function(visitor) {
   return visitor.visitLabeledStatement(this);
 }
+LabeledStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for lang_ExpressionStatement **************
 function lang_ExpressionStatement(body, span) {
   this.body = body;
@@ -17949,6 +19545,9 @@ $inherits(lang_ExpressionStatement, lang_Statement);
 lang_ExpressionStatement.prototype.visit = function(visitor) {
   return visitor.visitExpressionStatement(this);
 }
+lang_ExpressionStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for EmptyStatement **************
 function EmptyStatement(span) {
   lang_Statement.call(this, span);
@@ -17958,6 +19557,9 @@ $inherits(EmptyStatement, lang_Statement);
 EmptyStatement.prototype.visit = function(visitor) {
   return visitor.visitEmptyStatement(this);
 }
+EmptyStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for DietStatement **************
 function DietStatement(span) {
   lang_Statement.call(this, span);
@@ -17967,6 +19569,9 @@ $inherits(DietStatement, lang_Statement);
 DietStatement.prototype.visit = function(visitor) {
   return visitor.visitDietStatement(this);
 }
+DietStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for NativeStatement **************
 function NativeStatement(body, span) {
   this.body = body;
@@ -17977,6 +19582,9 @@ $inherits(NativeStatement, lang_Statement);
 NativeStatement.prototype.visit = function(visitor) {
   return visitor.visitNativeStatement(this);
 }
+NativeStatement.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for LambdaExpression **************
 function LambdaExpression(func, span) {
   this.func = func;
@@ -17984,9 +19592,13 @@ function LambdaExpression(func, span) {
   // Initializers done
 }
 $inherits(LambdaExpression, lang_Expression);
+LambdaExpression.prototype.is$LambdaExpression = function(){return this;};
 LambdaExpression.prototype.visit = function(visitor) {
   return visitor.visitLambdaExpression(this);
 }
+LambdaExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for CallExpression **************
 function CallExpression(target, arguments, span) {
   this.target = target;
@@ -18001,6 +19613,9 @@ CallExpression.prototype.set$arguments = function(value) { return this.arguments
 CallExpression.prototype.visit = function(visitor) {
   return visitor.visitCallExpression(this);
 }
+CallExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for IndexExpression **************
 function IndexExpression(target, index, span) {
   this.target = target;
@@ -18013,6 +19628,9 @@ IndexExpression.prototype.is$IndexExpression = function(){return this;};
 IndexExpression.prototype.visit = function(visitor) {
   return visitor.visitIndexExpression(this);
 }
+IndexExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for BinaryExpression **************
 function BinaryExpression(op, x, y, span) {
   this.op = op;
@@ -18026,6 +19644,9 @@ BinaryExpression.prototype.is$BinaryExpression = function(){return this;};
 BinaryExpression.prototype.visit = function(visitor) {
   return visitor.visitBinaryExpression(this);
 }
+BinaryExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for UnaryExpression **************
 function UnaryExpression(op, self, span) {
   this.op = op;
@@ -18037,6 +19658,9 @@ $inherits(UnaryExpression, lang_Expression);
 UnaryExpression.prototype.visit = function(visitor) {
   return visitor.visitUnaryExpression(this);
 }
+UnaryExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for PostfixExpression **************
 function PostfixExpression(body, op, span) {
   this.body = body;
@@ -18049,6 +19673,9 @@ PostfixExpression.prototype.is$PostfixExpression = function(){return this;};
 PostfixExpression.prototype.visit = function(visitor) {
   return visitor.visitPostfixExpression$1(this);
 }
+PostfixExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for lang_NewExpression **************
 function lang_NewExpression(isConst, type, name, arguments, span) {
   this.isConst = isConst;
@@ -18068,6 +19695,9 @@ lang_NewExpression.prototype.set$arguments = function(value) { return this.argum
 lang_NewExpression.prototype.visit = function(visitor) {
   return visitor.visitNewExpression(this);
 }
+lang_NewExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for ListExpression **************
 function ListExpression(isConst, type, values, span) {
   this.isConst = isConst;
@@ -18082,6 +19712,9 @@ ListExpression.prototype.set$isConst = function(value) { return this.isConst = v
 ListExpression.prototype.visit = function(visitor) {
   return visitor.visitListExpression(this);
 }
+ListExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for MapExpression **************
 function MapExpression(isConst, type, items, span) {
   this.isConst = isConst;
@@ -18096,6 +19729,9 @@ MapExpression.prototype.set$isConst = function(value) { return this.isConst = va
 MapExpression.prototype.visit = function(visitor) {
   return visitor.visitMapExpression(this);
 }
+MapExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for ConditionalExpression **************
 function ConditionalExpression(test, trueBranch, falseBranch, span) {
   this.test = test;
@@ -18108,6 +19744,9 @@ $inherits(ConditionalExpression, lang_Expression);
 ConditionalExpression.prototype.visit = function(visitor) {
   return visitor.visitConditionalExpression(this);
 }
+ConditionalExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for IsExpression **************
 function IsExpression(isTrue, x, type, span) {
   this.isTrue = isTrue;
@@ -18120,6 +19759,9 @@ $inherits(IsExpression, lang_Expression);
 IsExpression.prototype.visit = function(visitor) {
   return visitor.visitIsExpression(this);
 }
+IsExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for ParenExpression **************
 function ParenExpression(body, span) {
   this.body = body;
@@ -18130,6 +19772,9 @@ $inherits(ParenExpression, lang_Expression);
 ParenExpression.prototype.visit = function(visitor) {
   return visitor.visitParenExpression(this);
 }
+ParenExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for DotExpression **************
 function DotExpression(self, name, span) {
   this.self = self;
@@ -18144,6 +19789,9 @@ DotExpression.prototype.set$name = function(value) { return this.name = value; }
 DotExpression.prototype.visit = function(visitor) {
   return visitor.visitDotExpression(this);
 }
+DotExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for VarExpression **************
 function VarExpression(name, span) {
   this.name = name;
@@ -18157,6 +19805,9 @@ VarExpression.prototype.set$name = function(value) { return this.name = value; }
 VarExpression.prototype.visit = function(visitor) {
   return visitor.visitVarExpression(this);
 }
+VarExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for ThisExpression **************
 function ThisExpression(span) {
   lang_Expression.call(this, span);
@@ -18166,6 +19817,9 @@ $inherits(ThisExpression, lang_Expression);
 ThisExpression.prototype.visit = function(visitor) {
   return visitor.visitThisExpression(this);
 }
+ThisExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for SuperExpression **************
 function SuperExpression(span) {
   lang_Expression.call(this, span);
@@ -18175,6 +19829,9 @@ $inherits(SuperExpression, lang_Expression);
 SuperExpression.prototype.visit = function(visitor) {
   return visitor.visitSuperExpression(this);
 }
+SuperExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for NullExpression **************
 function NullExpression(span) {
   lang_Expression.call(this, span);
@@ -18184,6 +19841,9 @@ $inherits(NullExpression, lang_Expression);
 NullExpression.prototype.visit = function(visitor) {
   return visitor.visitNullExpression(this);
 }
+NullExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for LiteralExpression **************
 function LiteralExpression(value, type, text, span) {
   this.value = value;
@@ -18200,6 +19860,9 @@ LiteralExpression.prototype.set$text = function(value) { return this.text = valu
 LiteralExpression.prototype.visit = function(visitor) {
   return visitor.visitLiteralExpression(this);
 }
+LiteralExpression.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for NameTypeReference **************
 function NameTypeReference(isFinal, name, names, span) {
   this.isFinal = isFinal;
@@ -18215,6 +19878,9 @@ NameTypeReference.prototype.set$name = function(value) { return this.name = valu
 NameTypeReference.prototype.visit = function(visitor) {
   return visitor.visitNameTypeReference(this);
 }
+NameTypeReference.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for GenericTypeReference **************
 function GenericTypeReference(baseType, typeArguments, depth, span) {
   this.baseType = baseType;
@@ -18228,6 +19894,9 @@ GenericTypeReference.prototype.is$GenericTypeReference = function(){return this;
 GenericTypeReference.prototype.visit = function(visitor) {
   return visitor.visitGenericTypeReference(this);
 }
+GenericTypeReference.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for FunctionTypeReference **************
 function FunctionTypeReference(isFinal, func, span) {
   this.isFinal = isFinal;
@@ -18240,6 +19909,9 @@ FunctionTypeReference.prototype.is$FunctionTypeReference = function(){return thi
 FunctionTypeReference.prototype.visit = function(visitor) {
   return visitor.visitFunctionTypeReference(this);
 }
+FunctionTypeReference.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for ArgumentNode **************
 function ArgumentNode(label, value, span) {
   this.label = label;
@@ -18254,6 +19926,9 @@ ArgumentNode.prototype.set$value = function(value) { return this.value = value;
 ArgumentNode.prototype.visit = function(visitor) {
   return visitor.visitArgumentNode(this);
 }
+ArgumentNode.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for FormalNode **************
 function FormalNode(isThis, isRest, type, name, value, span) {
   this.isThis = isThis;
@@ -18272,6 +19947,9 @@ FormalNode.prototype.set$value = function(value) { return this.value = value; };
 FormalNode.prototype.visit = function(visitor) {
   return visitor.visitFormalNode(this);
 }
+FormalNode.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for CatchNode **************
 function CatchNode(exception, trace, body, span) {
   this.exception = exception;
@@ -18286,6 +19964,9 @@ CatchNode.prototype.set$exception = function(value) { return this.exception = va
 CatchNode.prototype.visit = function(visitor) {
   return visitor.visitCatchNode(this);
 }
+CatchNode.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for CaseNode **************
 function CaseNode(label, cases, statements, span) {
   this.label = label;
@@ -18298,6 +19979,9 @@ $inherits(CaseNode, lang_Node);
 CaseNode.prototype.visit = function(visitor) {
   return visitor.visitCaseNode(this);
 }
+CaseNode.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for TypeParameter **************
 function TypeParameter(name, extendsType, span) {
   this.name = name;
@@ -18311,6 +19995,9 @@ TypeParameter.prototype.set$name = function(value) { return this.name = value; }
 TypeParameter.prototype.visit = function(visitor) {
   return visitor.visitTypeParameter(this);
 }
+TypeParameter.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for lang_Identifier **************
 function lang_Identifier(name, span) {
   this.name = name;
@@ -18323,6 +20010,9 @@ lang_Identifier.prototype.set$name = function(value) { return this.name = value;
 lang_Identifier.prototype.visit = function(visitor) {
   return visitor.visitIdentifier(this);
 }
+lang_Identifier.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for DeclaredIdentifier **************
 function DeclaredIdentifier(type, name, span) {
   this.type = type;
@@ -18337,6 +20027,9 @@ DeclaredIdentifier.prototype.set$name = function(value) { return this.name = val
 DeclaredIdentifier.prototype.visit = function(visitor) {
   return visitor.visitDeclaredIdentifier(this);
 }
+DeclaredIdentifier.prototype.visit$1 = function($0) {
+  return this.visit(($0 && $0.is$TreeVisitor()));
+};
 // ********** Code for lang_Type **************
 function lang_Type(name) {
   this.name = name;
@@ -18466,7 +20159,7 @@ lang_Type.prototype.needsVarCall = function(args) {
   }
   var call = this.getCallMethod();
   if ($notnull_bool($ne(call, null))) {
-    if (args.get$length() != call.get$parameters().length || !$notnull_bool(call.namesInOrder(args))) {
+    if (args.get$length() != call.get$parameters().length || !$notnull_bool(call.namesInOrder$1(args))) {
       return true;
     }
   }
@@ -18512,10 +20205,10 @@ lang_Type.prototype.isSubtypeOf = function(other) {
     return lang_Type._isFunctionSubtypeOf((call && call.is$MethodMember()), (otherCall && otherCall.is$MethodMember()));
   }
   if ($notnull_bool($notnull_bool($eq(this.get$genericType(), other.get$genericType()) && $ne(this.get$typeArgsInOrder(), null)) && $ne(other.get$typeArgsInOrder(), null)) && this.get$typeArgsInOrder().length == other.get$typeArgsInOrder().length) {
-    var t = this.get$typeArgsInOrder().iterator();
-    var s = other.get$typeArgsInOrder().iterator();
-    while ($notnull_bool(t.hasNext())) {
-      if (!$notnull_bool(t.next().isSubtypeOf(s.next()))) return false;
+    var t = this.get$typeArgsInOrder().iterator$0();
+    var s = other.get$typeArgsInOrder().iterator$0();
+    while ($notnull_bool(t.hasNext$0())) {
+      if (!$notnull_bool(t.next$0().isSubtypeOf$1(s.next$0()))) return false;
     }
     return true;
   }
@@ -18523,7 +20216,7 @@ lang_Type.prototype.isSubtypeOf = function(other) {
     return true;
   }
   if (this.get$interfaces() != null && this.get$interfaces().some((function (i) {
-    return i.isSubtypeOf(other);
+    return i.isSubtypeOf$1(other);
   })
   )) {
     return true;
@@ -18531,7 +20224,6 @@ lang_Type.prototype.isSubtypeOf = function(other) {
   return false;
 }
 lang_Type._isFunctionSubtypeOf = function(t, s) {
-  var $0;
   if (!$notnull_bool(s.returnType.get$isVoid()) && !$notnull_bool(s.returnType.isAssignable(t.returnType))) {
     return false;
   }
@@ -18542,11 +20234,44 @@ lang_Type._isFunctionSubtypeOf = function(t, s) {
    i < sp.length; i++) {
     if ($ne(tp.$index(i).get$isOptional(), sp.$index(i).get$isOptional())) return false;
     if ($notnull_bool(tp.$index(i).get$isOptional() && $ne(tp.$index(i).get$name(), sp.$index(i).get$name()))) return false;
-    if (!$notnull_bool(tp.$index(i).type.isAssignable((($0 = sp.$index(i).type) && $0.is$lang_Type())))) return false;
+    if (!$notnull_bool(tp.$index(i).type.isAssignable$1(sp.$index(i).type))) return false;
   }
   if (tp.length > sp.length && !$notnull_bool(tp.$index(sp.length).get$isOptional())) return false;
   return true;
 }
+lang_Type.prototype.addDirectSubtype$1 = function($0) {
+  return this.addDirectSubtype(($0 && $0.is$lang_Type()));
+};
+lang_Type.prototype.ensureSubtypeOf$3 = function($0, $1, $2) {
+  return this.ensureSubtypeOf(($0 && $0.is$lang_Type()), ($1 && $1.is$SourceSpan()), $assert_bool($2));
+};
+lang_Type.prototype.getConstructor$1 = function($0) {
+  return this.getConstructor($assert_String($0));
+};
+lang_Type.prototype.getMember$1 = function($0) {
+  return this.getMember($assert_String($0));
+};
+lang_Type.prototype.getOrMakeConcreteType$1 = function($0) {
+  return this.getOrMakeConcreteType(($0 && $0.is$List$Type()));
+};
+lang_Type.prototype.hashCode$0 = function() {
+  return this.hashCode();
+};
+lang_Type.prototype.isAssignable$1 = function($0) {
+  return this.isAssignable(($0 && $0.is$lang_Type()));
+};
+lang_Type.prototype.isSubtypeOf$1 = function($0) {
+  return this.isSubtypeOf(($0 && $0.is$lang_Type()));
+};
+lang_Type.prototype.markUsed$0 = function() {
+  return this.markUsed();
+};
+lang_Type.prototype.resolveMember$1 = function($0) {
+  return this.resolveMember($assert_String($0));
+};
+lang_Type.prototype.resolveTypeParams$1 = function($0) {
+  return this.resolveTypeParams(($0 && $0.is$ConcreteType()));
+};
 // ********** Code for ParameterType **************
 function ParameterType(name, typeParameter) {
   this.typeParameter = typeParameter;
@@ -18600,6 +20325,27 @@ ParameterType.prototype.resolve = function(inType) {
     this.extendsType = world.objectType;
   }
 }
+ParameterType.prototype.addDirectSubtype$1 = function($0) {
+  return this.addDirectSubtype(($0 && $0.is$lang_Type()));
+};
+ParameterType.prototype.getConstructor$1 = function($0) {
+  return this.getConstructor($assert_String($0));
+};
+ParameterType.prototype.getOrMakeConcreteType$1 = function($0) {
+  return this.getOrMakeConcreteType(($0 && $0.is$List$Type()));
+};
+ParameterType.prototype.isSubtypeOf$1 = function($0) {
+  return this.isSubtypeOf(($0 && $0.is$lang_Type()));
+};
+ParameterType.prototype.resolve$1 = function($0) {
+  return this.resolve(($0 && $0.is$lang_Type()));
+};
+ParameterType.prototype.resolveMember$1 = function($0) {
+  return this.resolveMember($assert_String($0));
+};
+ParameterType.prototype.resolveTypeParams$1 = function($0) {
+  return this.resolveTypeParams(($0 && $0.is$ConcreteType()));
+};
 // ********** Code for NonNullableType **************
 function NonNullableType(type) {
   this.type = type;
@@ -18709,6 +20455,30 @@ NonNullableType.prototype.getAllMembers = function() {
 NonNullableType.prototype.get$isNativeType = function() {
   return this.type.get$isNativeType();
 }
+NonNullableType.prototype.addDirectSubtype$1 = function($0) {
+  return this.addDirectSubtype(($0 && $0.is$lang_Type()));
+};
+NonNullableType.prototype.getConstructor$1 = function($0) {
+  return this.getConstructor($assert_String($0));
+};
+NonNullableType.prototype.getMember$1 = function($0) {
+  return this.getMember($assert_String($0));
+};
+NonNullableType.prototype.getOrMakeConcreteType$1 = function($0) {
+  return this.getOrMakeConcreteType(($0 && $0.is$List$Type()));
+};
+NonNullableType.prototype.isSubtypeOf$1 = function($0) {
+  return this.isSubtypeOf(($0 && $0.is$lang_Type()));
+};
+NonNullableType.prototype.markUsed$0 = function() {
+  return this.markUsed();
+};
+NonNullableType.prototype.resolveMember$1 = function($0) {
+  return this.resolveMember($assert_String($0));
+};
+NonNullableType.prototype.resolveTypeParams$1 = function($0) {
+  return this.resolveTypeParams(($0 && $0.is$ConcreteType()));
+};
 // ********** Code for ConcreteType **************
 function ConcreteType(name, genericType, typeArguments, typeArgsInOrder) {
   this.genericType = genericType;
@@ -18721,6 +20491,7 @@ function ConcreteType(name, genericType, typeArguments, typeArgsInOrder) {
   // Initializers done
 }
 $inherits(ConcreteType, lang_Type);
+ConcreteType.prototype.is$ConcreteType = function(){return this;};
 ConcreteType.prototype.get$genericType = function() { return this.genericType; };
 ConcreteType.prototype.get$typeArgsInOrder = function() { return this.typeArgsInOrder; };
 ConcreteType.prototype.set$typeArgsInOrder = function(value) { return this.typeArgsInOrder = value; };
@@ -18737,10 +20508,10 @@ ConcreteType.prototype.get$span = function() {
   return this.genericType.get$span();
 }
 ConcreteType.prototype.get$hasTypeParams = function() {
-  return $assert_bool(this.typeArguments.getValues().some((function (e) {
+  return this.typeArguments.getValues().some$1((function (e) {
     return (e instanceof ParameterType);
   })
-  ));
+  );
 }
 ConcreteType.prototype.get$members = function() { return this.members; };
 ConcreteType.prototype.set$members = function(value) { return this.members = value; };
@@ -18754,9 +20525,9 @@ ConcreteType.prototype.resolveTypeParams = function(inType) {
   var $list = this.typeArgsInOrder;
   for (var $i = 0;$i < $list.length; $i++) {
     var t = $list.$index($i);
-    var newType = t.resolveTypeParams(inType);
+    var newType = t.resolveTypeParams$1(inType);
     if ($notnull_bool($ne(newType, t))) needsNewType = true;
-    newTypeArgs.add(newType);
+    newTypeArgs.add$1(newType);
   }
   if (!$notnull_bool(needsNewType)) return this;
   return this.genericType.getOrMakeConcreteType((newTypeArgs && newTypeArgs.is$List$Type()));
@@ -18773,7 +20544,7 @@ ConcreteType.prototype.get$interfaces = function() {
     var $list = this.genericType.interfaces;
     for (var $i = 0;$i < $list.length; $i++) {
       var i = $list.$index($i);
-      this._interfaces.add(i.resolveTypeParams(this));
+      this._interfaces.add(i.resolveTypeParams$1(this));
     }
   }
   return this._interfaces;
@@ -18783,9 +20554,9 @@ ConcreteType.prototype.getCallMethod = function() {
 }
 ConcreteType.prototype.getAllMembers = function() {
   var result = this.genericType.getAllMembers();
-  var $list = result.getKeys();
-  for (var $i = result.getKeys().iterator(); $i.hasNext(); ) {
-    var memberName = $i.next();
+  var $list = result.getKeys$0();
+  for (var $i = result.getKeys$0().iterator(); $i.hasNext$0(); ) {
+    var memberName = $i.next$0();
     var myMember = this.members.$index(memberName);
     if ($notnull_bool($ne(myMember, null))) {
       result.$setindex(memberName, myMember);
@@ -18812,7 +20583,7 @@ ConcreteType.prototype.getConstructor = function(constructorName) {
   if ($ne(genericMember.declaringType, this.genericType)) {
     if (!$notnull_bool(genericMember.declaringType.get$isGeneric())) return genericMember;
     var newDeclaringType = genericMember.declaringType.getOrMakeConcreteType(this.typeArgsInOrder);
-    return newDeclaringType.getConstructor(constructorName);
+    return newDeclaringType.getConstructor$1(constructorName);
   }
   if ($notnull_bool(genericMember.get$isFactory())) {
     ret = new ConcreteMember($assert_String(genericMember.get$name()), this, genericMember);
@@ -18836,13 +20607,13 @@ ConcreteType.prototype.getMember = function(memberName) {
 ConcreteType.prototype.resolveMember = function(memberName) {
   var mem = this.getMember(memberName);
   if ($notnull_bool(mem == null)) return null;
-  var ret = new MemberSet((mem && mem.is$Member()));
+  var ret = new MemberSet((mem && mem.is$Member()), false);
   if ($notnull_bool(mem.get$isStatic())) return (ret && ret.is$MemberSet());
   var $list = this.genericType.get$subtypes();
-  for (var $i = this.genericType.get$subtypes().iterator(); $i.hasNext(); ) {
-    var t = $i.next();
+  for (var $i = this.genericType.get$subtypes().iterator(); $i.hasNext$0(); ) {
+    var t = $i.next$0();
     var m = t.get$members().$index(memberName);
-    if ($notnull_bool($ne(m, null))) ret.add(m);
+    if ($notnull_bool($ne(m, null))) ret.add$1(m);
   }
   return (ret && ret.is$MemberSet());
 }
@@ -18853,6 +20624,27 @@ ConcreteType.prototype.resolveType = function(node, isRequired) {
 ConcreteType.prototype.addDirectSubtype = function(type) {
   this.genericType.addDirectSubtype(type);
 }
+ConcreteType.prototype.addDirectSubtype$1 = function($0) {
+  return this.addDirectSubtype(($0 && $0.is$lang_Type()));
+};
+ConcreteType.prototype.getConstructor$1 = function($0) {
+  return this.getConstructor($assert_String($0));
+};
+ConcreteType.prototype.getMember$1 = function($0) {
+  return this.getMember($assert_String($0));
+};
+ConcreteType.prototype.getOrMakeConcreteType$1 = function($0) {
+  return this.getOrMakeConcreteType(($0 && $0.is$List$Type()));
+};
+ConcreteType.prototype.markUsed$0 = function() {
+  return this.markUsed();
+};
+ConcreteType.prototype.resolveMember$1 = function($0) {
+  return this.resolveMember($assert_String($0));
+};
+ConcreteType.prototype.resolveTypeParams$1 = function($0) {
+  return this.resolveTypeParams(($0 && $0.is$ConcreteType()));
+};
 // ********** Code for DefinedType **************
 function DefinedType(name, library, definition, isClass) {
   this.isUsed = false
@@ -18998,8 +20790,8 @@ DefinedType.prototype._resolveInterfaces = function(types) {
     if ($notnull_bool(resolvedInterface.get$isClosed() && !($notnull_bool(this.library.get$isCore() || this.library.get$isCoreImpl())))) {
       world.error(('can not implement "' + resolvedInterface.get$name() + '": ') + 'only native implementation allowed', type.get$span());
     }
-    resolvedInterface.addDirectSubtype(this);
-    interfaces.add(resolvedInterface);
+    resolvedInterface.addDirectSubtype$1(this);
+    interfaces.add$1(resolvedInterface);
   }
   return (interfaces && interfaces.is$List$Type());
 }
@@ -19011,8 +20803,8 @@ DefinedType.prototype.get$subtypes = function() {
   if (this._subtypes == null) {
     this._subtypes = new HashSetImplementation$Type();
     var $list = this.directSubtypes;
-    for (var $i = this.directSubtypes.iterator(); $i.hasNext(); ) {
-      var st = $i.next();
+    for (var $i = this.directSubtypes.iterator(); $i.hasNext$0(); ) {
+      var st = $i.next$0();
       this._subtypes.add(st);
       this._subtypes.addAll(st.get$subtypes());
     }
@@ -19048,8 +20840,8 @@ DefinedType.prototype._cycleInInterfaceExtends = function() {
     seen.add(ancestor);
     if ($notnull_bool($ne(ancestor.get$interfaces(), null))) {
       var $list = ancestor.get$interfaces();
-      for (var $i = ancestor.get$interfaces().iterator(); $i.hasNext(); ) {
-        var parent = $i.next();
+      for (var $i = ancestor.get$interfaces().iterator$0(); $i.hasNext$0(); ) {
+        var parent = $i.next$0();
         if ($notnull_bool(_helper(parent))) return true;
       }
     }
@@ -19088,6 +20880,7 @@ DefinedType.prototype.resolve = function() {
       else {
         if (!$notnull_bool(this.get$isObject())) {
           this.set$parent(world.objectType);
+          this.get$parent().addDirectSubtype(this);
         }
       }
       this.interfaces = this._resolveInterfaces(typeDef.implementsTypes);
@@ -19119,22 +20912,22 @@ DefinedType.prototype.resolve = function() {
     var $list = this.typeParameters;
     for (var $i = 0;$i < $list.length; $i++) {
       var tp = $list.$index($i);
-      tp.resolve(this);
+      tp.resolve$1(this);
     }
   }
   world._addType(this);
   var $list = this.constructors.getValues();
-  for (var $i = this.constructors.getValues().iterator(); $i.hasNext(); ) {
-    var c = $i.next();
-    c.resolve(this);
+  for (var $i = this.constructors.getValues().iterator$0(); $i.hasNext$0(); ) {
+    var c = $i.next$0();
+    c.resolve$1(this);
   }
   var $list0 = this.members.getValues();
-  for (var $i = this.members.getValues().iterator(); $i.hasNext(); ) {
-    var m = $i.next();
-    m.resolve(this);
+  for (var $i = this.members.getValues().iterator$0(); $i.hasNext$0(); ) {
+    var m = $i.next$0();
+    m.resolve$1(this);
   }
   this.factories.forEach((function (f) {
-    return f.resolve($this);
+    return f.resolve$1($this);
   })
   );
 }
@@ -19244,7 +21037,7 @@ DefinedType.prototype._tryCreateDefaultConstructor = function(name) {
     var typeDef = (($0 = this.definition) && $0.is$TypeDefinition());
     var c = new FunctionDefinition(null, null, typeDef.name, [], inits, body, (span && span.is$SourceSpan()));
     this.addMethod(null, (c && c.is$FunctionDefinition()));
-    this.constructors.$index('').resolve(this);
+    this.constructors.$index('').resolve$1(this);
     return this.constructors.$index('');
   }
   return null;
@@ -19288,7 +21081,7 @@ DefinedType.prototype.getMemberInParents = function(memberName) {
       var $list = this.interfaces;
       for (var $i = 0;$i < $list.length; $i++) {
         var i = $list.$index($i);
-        var ret = i.getMember(memberName);
+        var ret = i.getMember$1(memberName);
         if ($notnull_bool($ne(ret, null))) {
           return (ret && ret.is$Member());
         }
@@ -19308,18 +21101,18 @@ DefinedType.prototype.resolveMember = function(memberName) {
   if (member == null) {
     return null;
   }
-  ret = new MemberSet(member);
+  ret = new MemberSet(member, false);
   this._resolvedMembers.$setindex(memberName, ret);
   if ($notnull_bool(member.get$isStatic())) {
     return ret;
   }
   else {
     var $list = this.get$subtypes();
-    for (var $i = this.get$subtypes().iterator(); $i.hasNext(); ) {
-      var t = $i.next();
+    for (var $i = this.get$subtypes().iterator(); $i.hasNext$0(); ) {
+      var t = $i.next$0();
       var m;
       if ($notnull_bool(!$notnull_bool(this.isClass) && t.get$isClass())) {
-        m = t.getMember(memberName);
+        m = t.getMember$1(memberName);
       }
       else {
         m = t.get$members().$index(memberName);
@@ -19408,12 +21201,12 @@ DefinedType.prototype.resolveType = function(node, typeErrors) {
      i < typeRef.typeArguments.length; i++) {
       var extendsType = baseType.get$typeParameters().$index(i).extendsType;
       var typeArg = this.resolveType((($0 = typeRef.typeArguments.$index(i)) && $0.is$TypeReference()), typeErrors);
-      typeArgs.add(typeArg);
+      typeArgs.add$1(typeArg);
       if ($notnull_bool($ne(extendsType, null) && !(typeArg instanceof ParameterType))) {
-        typeArg.ensureSubtypeOf((extendsType && extendsType.is$lang_Type()), typeRef.typeArguments.$index(i).get$span(), typeErrors);
+        typeArg.ensureSubtypeOf$3(extendsType, typeRef.typeArguments.$index(i).get$span(), typeErrors);
       }
     }
-    typeRef.type = baseType.getOrMakeConcreteType(typeArgs);
+    typeRef.type = baseType.getOrMakeConcreteType$1(typeArgs);
   }
   else if ((node instanceof FunctionTypeReference)) {
     var typeRef = (node && node.is$FunctionTypeReference());
@@ -19430,14 +21223,14 @@ DefinedType.prototype.resolveTypeParams = function(inType) {
   return this;
 }
 DefinedType.prototype.getOrMakeConcreteType = function(typeArgs) {
-  $assert(this.get$isGeneric(), "isGeneric", "type.dart", 1226, 12);
+  $assert(this.get$isGeneric(), "isGeneric", "type.dart", 1227, 12);
   var names = [this.name];
   var typeMap = $map([]);
   for (var i = 0;
    i < typeArgs.length; i++) {
     var paramName = this.typeParameters.$index(i).get$name();
     typeMap.$setindex(paramName, typeArgs.$index(i));
-    names.add(typeArgs.$index(i).get$name());
+    names.add$1(typeArgs.$index(i).get$name());
   }
   var concreteName = Strings.join((names && names.is$List$String()), '\$');
   var ret = this._concreteTypes.$index(concreteName);
@@ -19448,7 +21241,7 @@ DefinedType.prototype.getOrMakeConcreteType = function(typeArgs) {
   return (ret && ret.is$lang_Type());
 }
 DefinedType.prototype.getCallStub = function(args) {
-  $assert(this.get$isFunction(), "isFunction", "type.dart", 1246, 12);
+  $assert(this.get$isFunction(), "isFunction", "type.dart", 1247, 12);
   var name = _getCallStubName('call', args);
   if (this.varStubs == null) this.varStubs = $map([]);
   var stub = this.varStubs.$index(name);
@@ -19458,12 +21251,44 @@ DefinedType.prototype.getCallStub = function(args) {
   }
   return (stub && stub.is$VarFunctionStub());
 }
+DefinedType.prototype.addDirectSubtype$1 = function($0) {
+  return this.addDirectSubtype(($0 && $0.is$lang_Type()));
+};
+DefinedType.prototype.addMethod$2 = function($0, $1) {
+  return this.addMethod($assert_String($0), ($1 && $1.is$FunctionDefinition()));
+};
+DefinedType.prototype.getConstructor$1 = function($0) {
+  return this.getConstructor($assert_String($0));
+};
+DefinedType.prototype.getMember$1 = function($0) {
+  return this.getMember($assert_String($0));
+};
+DefinedType.prototype.getOrMakeConcreteType$1 = function($0) {
+  return this.getOrMakeConcreteType(($0 && $0.is$List$Type()));
+};
+DefinedType.prototype.markUsed$0 = function() {
+  return this.markUsed();
+};
+DefinedType.prototype.resolve$0 = function() {
+  return this.resolve();
+};
+DefinedType.prototype.resolveMember$1 = function($0) {
+  return this.resolveMember($assert_String($0));
+};
+DefinedType.prototype.resolveTypeParams$1 = function($0) {
+  return this.resolveTypeParams(($0 && $0.is$ConcreteType()));
+};
+DefinedType.prototype.setDefinition$1 = function($0) {
+  return this.setDefinition(($0 && $0.is$Definition()));
+};
 // ********** Code for FixedCollection **************
 function FixedCollection(value, length) {
   this.value = value;
   this.length = length;
   // Initializers done
 }
+FixedCollection.prototype.is$Collection$E = function(){return this;};
+FixedCollection.prototype.is$Collection$Object = function(){return this;};
 FixedCollection.prototype.is$Collection$Type = function(){return this;};
 FixedCollection.prototype.is$Iterable = function(){return this;};
 FixedCollection.prototype.get$value = function() { return this.value; };
@@ -19482,6 +21307,14 @@ FixedCollection.prototype.some = function(f) {
 FixedCollection.prototype.isEmpty = function() {
   return this.length == 0;
 }
+FixedCollection.prototype.filter$1 = FixedCollection.prototype.filter;
+FixedCollection.prototype.isEmpty$0 = function() {
+  return this.isEmpty();
+};
+FixedCollection.prototype.iterator$0 = function() {
+  return this.iterator();
+};
+FixedCollection.prototype.some$1 = FixedCollection.prototype.some;
 // ********** Code for FixedCollection$Type **************
 function FixedCollection$Type(value, length) {
   this.value = value;
@@ -19489,6 +21322,8 @@ function FixedCollection$Type(value, length) {
   // Initializers done
 }
 $inherits(FixedCollection$Type, FixedCollection);
+FixedCollection$Type.prototype.is$Collection$E = function(){return this;};
+FixedCollection$Type.prototype.is$Collection$Object = function(){return this;};
 FixedCollection$Type.prototype.is$Collection$Type = function(){return this;};
 FixedCollection$Type.prototype.is$Iterable = function(){return this;};
 // ********** Code for FixedIterator **************
@@ -19507,6 +21342,12 @@ FixedIterator.prototype.next = function() {
   this._index++;
   return this.value;
 }
+FixedIterator.prototype.hasNext$0 = function() {
+  return this.hasNext();
+};
+FixedIterator.prototype.next$0 = function() {
+  return this.next();
+};
 // ********** Code for FixedIterator$E **************
 function FixedIterator$E(value, length) {
   this._index = 0
@@ -19579,7 +21420,7 @@ Value.prototype.invoke = function(context, name, node, args, isDynamic) {
     return this.invokeNoSuchMethod(context, name, node, args);
   }
   else {
-    return member.invoke(context, node, this, args, isDynamic);
+    return member.invoke$5(context, node, this, args, isDynamic);
   }
 }
 Value.prototype.canInvoke = function(context, name, args) {
@@ -19590,7 +21431,7 @@ Value.prototype.canInvoke = function(context, name, args) {
     return true;
   }
   var member = this._resolveMember(context, name, null, true);
-  return $notnull_bool($ne(member, null) && member.canInvoke(context, args));
+  return $notnull_bool($ne(member, null) && member.canInvoke$2(context, args));
 }
 Value.prototype._hasOverriddenNoSuchMethod = function() {
   if ($notnull_bool(this.isSuper)) {
@@ -19785,18 +21626,17 @@ Value.prototype.convertWarning = function(toType, node) {
   world.warning(('type "' + this.type.name + '" is not assignable to "' + toType.name + '"'), node.span);
 }
 Value.prototype.invokeNoSuchMethod = function(context, name, node, args) {
-  var $0;
   var pos = '';
   if (args != null) {
     var argsCode = [];
     for (var i = 0;
      i < args.get$length(); i++) {
-      argsCode.add(args.values.$index(i).code);
+      argsCode.add$1(args.values.$index(i).code);
     }
     pos = Strings.join((argsCode && argsCode.is$List$String()), ", ");
   }
   var noSuchArgs = [new Value(world.stringType, ('"' + name + '"'), node.span, true), new Value(world.listType, ('[' + pos + ']'), node.span, true)];
-  return (($0 = this._resolveMember(context, 'noSuchMethod', node, false).invoke$4(context, node, this, new Arguments(null, noSuchArgs))) && $0.is$Value());
+  return this._resolveMember(context, 'noSuchMethod', node, false).invoke$4(context, node, this, new Arguments(null, noSuchArgs));
 }
 Value.prototype.invokeSpecial = function(name, args, returnType) {
   $assert(name.startsWith('\$'), "name.startsWith('\\$')", "value.dart", 449, 12);
@@ -19811,10 +21651,39 @@ Value.prototype.invokeSpecial = function(name, args, returnType) {
     return new Value(returnType, ('' + name + '(' + this.code + '' + argsString + ')'), this.span, true);
   }
 }
+Value.prototype.checkFirstClass$1 = function($0) {
+  return this.checkFirstClass(($0 && $0.is$SourceSpan()));
+};
+Value.prototype.convertTo$3 = function($0, $1, $2) {
+  return this.convertTo(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Type()), ($2 && $2.is$lang_Node()), false);
+};
+Value.prototype.convertTo$4 = function($0, $1, $2, $3) {
+  return this.convertTo(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Type()), ($2 && $2.is$lang_Node()), $assert_bool($3));
+};
+Value.prototype.get_$3 = function($0, $1, $2) {
+  return this.get_(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$lang_Node()));
+};
+Value.prototype.instanceOf$3$isTrue$forceCheck = function($0, $1, $2, isTrue, forceCheck) {
+  return this.instanceOf(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Type()), ($2 && $2.is$SourceSpan()), $assert_bool(isTrue), $assert_bool(forceCheck));
+};
+Value.prototype.instanceOf$4 = function($0, $1, $2, $3) {
+  return this.instanceOf(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Type()), ($2 && $2.is$SourceSpan()), $assert_bool($3), false);
+};
 Value.prototype.invoke$4 = function($0, $1, $2, $3) {
   return this.invoke(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$lang_Node()), ($3 && $3.is$Arguments()), false);
-}
-;
+};
+Value.prototype.invoke$4$isDynamic = function($0, $1, $2, $3, isDynamic) {
+  return this.invoke(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$lang_Node()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
+};
+Value.prototype.invoke$5 = function($0, $1, $2, $3, $4) {
+  return this.invoke(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$lang_Node()), ($3 && $3.is$Arguments()), $assert_bool($4));
+};
+Value.prototype.needsConversion$1 = function($0) {
+  return this.needsConversion(($0 && $0.is$lang_Type()));
+};
+Value.prototype.set_$4 = function($0, $1, $2, $3) {
+  return this.set_(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$lang_Node()), ($3 && $3.is$Value()), false);
+};
 // ********** Code for EvaluatedValue **************
 function EvaluatedValue() {}
 EvaluatedValue._internal$ctor = function(type, actualValue, canonicalCode, span, code) {
@@ -19879,12 +21748,12 @@ $inherits(ConstObjectValue, EvaluatedValue);
 ConstObjectValue.ConstObjectValue$factory = function(type, fields, canonicalCode, span) {
   var fieldValues = [];
   var $list = fields.getKeys();
-  for (var $i = fields.getKeys().iterator(); $i.hasNext(); ) {
-    var f = $i.next();
+  for (var $i = fields.getKeys().iterator$0(); $i.hasNext$0(); ) {
+    var f = $i.next$0();
     fieldValues.add(('' + f + ' = ' + fields.$index(f).get$actualValue() + ''));
   }
   fieldValues.sort((function (a, b) {
-    return a.compareTo(b);
+    return a.compareTo$1(b);
   })
   );
   var actualValue = ('const ' + type.get$jsname() + ' [') + Strings.join(fieldValues, ',') + ']';
@@ -19902,10 +21771,11 @@ function GlobalValue(type, code, isConst, field, name, exp, canonicalCode, span,
 }
 $inherits(GlobalValue, Value);
 GlobalValue.prototype.is$GlobalValue = function(){return this;};
+GlobalValue.prototype.is$Comparable = function(){return this;};
 GlobalValue.GlobalValue$fromStatic$factory = function(field, exp, dependencies) {
   var code = ($notnull_bool(exp.get$isConst()) ? exp.get$canonicalCode() : exp.code);
   var codeWithComment = ('' + code + '/*' + field.declaringType.name + '.' + field.get$name() + '*/');
-  return new GlobalValue(exp.type, $assert_String(codeWithComment), field.isFinal, field, null, exp, code, exp.span, dependencies.filter((function (d) {
+  return new GlobalValue(exp.type, $assert_String(codeWithComment), field.isFinal, field, null, exp, code, exp.span, dependencies.filter$1((function (d) {
     return (d instanceof GlobalValue);
   })
   ));
@@ -19913,7 +21783,7 @@ GlobalValue.GlobalValue$fromStatic$factory = function(field, exp, dependencies)
 GlobalValue.GlobalValue$fromConst$factory = function(uniqueId, exp, dependencies) {
   var name = ("const\$" + uniqueId + "");
   var codeWithComment = ("" + name + "/*" + exp.span.get$text() + "*/");
-  return new GlobalValue(exp.type, $assert_String(codeWithComment), true, null, name, exp, name, exp.span, dependencies.filter((function (d) {
+  return new GlobalValue(exp.type, $assert_String(codeWithComment), true, null, name, exp, name, exp.span, dependencies.filter$1((function (d) {
     return (d instanceof GlobalValue);
   })
   ));
@@ -19957,6 +21827,9 @@ GlobalValue.prototype.compareTo = function(other) {
     return this.field.name.compareTo(other.field.name);
   }
 }
+GlobalValue.prototype.compareTo$1 = function($0) {
+  return this.compareTo(($0 && $0.is$GlobalValue()));
+};
 // ********** Code for BareValue **************
 function BareValue(home, outermost, span) {
   this.home = home;
@@ -19998,6 +21871,9 @@ CompilerException.prototype.toString = function() {
     return ('CompilerException: ' + this._lang_message + '');
   }
 }
+CompilerException.prototype.toString$0 = function() {
+  return this.toString();
+};
 // ********** Code for World **************
 function World(files) {
   this.errors = 0
@@ -20052,11 +21928,11 @@ World.prototype._addMember = function(member) {
   }
   var mset = this._members.$index(member.name);
   if ($notnull_bool(mset == null)) {
-    mset = new MemberSet(member);
+    mset = new MemberSet(member, true);
     this._members.$setindex(mset.get$name(), mset);
   }
   else {
-    mset.get$members().add(member);
+    mset.get$members().add$1(member);
   }
 }
 World.prototype._addTopName = function(named) {
@@ -20166,8 +22042,8 @@ World.prototype.runCompilationPhases = function() {
     }
     else if (mainMembers.get$members().length > 1) {
       var $list = mainMembers.get$members();
-      for (var $i = mainMembers.get$members().iterator(); $i.hasNext(); ) {
-        var m = $i.next();
+      for (var $i = mainMembers.get$members().iterator$0(); $i.hasNext$0(); ) {
+        var m = $i.next$0();
         main = m;
         $this.error('more than one main member (using last?)', main.get$span());
       }
@@ -20225,7 +22101,7 @@ World.prototype.process = function() {
     this._todo = [];
     for (var $i = 0;$i < todo.length; $i++) {
       var lib = todo.$index($i);
-      lib.visitSources();
+      lib.visitSources$0();
     }
   }
 }
@@ -20236,9 +22112,9 @@ World.prototype.processScript = function(filename) {
 }
 World.prototype.resolveAll = function() {
   var $list = this.libraries.getValues();
-  for (var $i = this.libraries.getValues().iterator(); $i.hasNext(); ) {
-    var lib = $i.next();
-    lib.resolve();
+  for (var $i = this.libraries.getValues().iterator$0(); $i.hasNext$0(); ) {
+    var lib = $i.next$0();
+    lib.resolve$0();
   }
 }
 World.prototype._message = function(message, span, span1, span2, throwing) {
@@ -20400,16 +22276,16 @@ function FrogOptions(homedir, args, files) {
 
       default:
 
-        if (arg.endsWith('.dart')) {
+        if ($notnull_bool(arg.endsWith$1('.dart'))) {
           this.dartScript = $assert_String(arg);
           this.childArgs = (($0 = args.getRange(i + 1, args.length - i - 1)) && $0.is$List$String());
           break loop;
         }
-        else if (arg.startsWith('--out=')) {
-          this.outfile = arg.substring('--out='.length);
+        else if ($notnull_bool(arg.startsWith$1('--out='))) {
+          this.outfile = arg.substring$1('--out='.length);
         }
-        else if (arg.startsWith('--libdir=')) {
-          this.libDir = arg.substring('--libdir='.length);
+        else if ($notnull_bool(arg.startsWith$1('--libdir='))) {
+          this.libDir = $assert_String(arg.substring$1('--libdir='.length));
           passedLibDir = true;
         }
         else {
@@ -20461,10 +22337,12 @@ VarMember.prototype.get$returnType = function() {
 VarMember.prototype.invoke = function(context, node, target, args) {
   return new Value(this.get$returnType(), ('' + target.code + '.' + this.name + '(' + args.getCode() + ')'), node.span, true);
 }
+VarMember.prototype.generate$1 = function($0) {
+  return this.generate(($0 && $0.is$CodeWriter()));
+};
 VarMember.prototype.invoke$4 = function($0, $1, $2, $3) {
   return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()));
-}
-;
+};
 // ********** Code for VarFunctionStub **************
 function VarFunctionStub(name, callArgs) {
   this.args = callArgs.toCallStubArgs();
@@ -20503,6 +22381,9 @@ VarFunctionStub.prototype.generateNamed = function(w) {
   w.writeln(('return this.' + this.name + '(' + argsCode + ');'));
   w.exitBlock('}');
 }
+VarFunctionStub.prototype.generate$1 = function($0) {
+  return this.generate(($0 && $0.is$CodeWriter()));
+};
 // ********** Code for VarMethodStub **************
 function VarMethodStub(name, member, args, body) {
   this.member = member;
@@ -20521,17 +22402,16 @@ VarMethodStub.prototype.get$typeName = function() {
 }
 VarMethodStub.prototype.generate = function(code) {
   code.write(('' + this.get$typeName() + '.prototype.' + this.name + ' = '));
-  this.generateBody(code);
-  code.writeln(';');
+  this.generateBody(code, ';');
 }
-VarMethodStub.prototype.generateBody = function(code) {
+VarMethodStub.prototype.generateBody = function(code, end) {
   if ($notnull_bool(this._useDirectCall(this.member, this.args))) {
-    code.write(('' + this.get$typeName() + '.prototype.' + this.member.get$jsname() + ''));
+    code.writeln(('' + this.get$typeName() + '.prototype.' + this.member.get$jsname() + '' + end + ''));
   }
   else {
     code.enterBlock(('function(' + this.args.getCode() + ') {'));
     code.writeln(('return ' + this.body.code + ';'));
-    code.exitBlock('}');
+    code.exitBlock(('}' + end + ''));
   }
 }
 VarMethodStub.prototype._useDirectCall = function(member, args) {
@@ -20552,6 +22432,12 @@ VarMethodStub.prototype._useDirectCall = function(member, args) {
     return false;
   }
 }
+VarMethodStub.prototype.generate$1 = function($0) {
+  return this.generate(($0 && $0.is$CodeWriter()));
+};
+VarMethodStub.prototype.generateBody$2 = function($0, $1) {
+  return this.generateBody(($0 && $0.is$CodeWriter()), $assert_String($1));
+};
 // ********** Code for VarMethodSet **************
 function VarMethodSet(name, members, callArgs, returnType) {
   this.members = members;
@@ -20572,6 +22458,7 @@ VarMethodSet.prototype.invoke = function(context, node, target, args) {
 }
 VarMethodSet.prototype._invokeMembers = function(context, node) {
   if (this._fallbackStubs != null) return;
+  var objectStub = null;
   this._fallbackStubs = [];
   var $list = this.members;
   for (var $i = 0;$i < $list.length; $i++) {
@@ -20580,21 +22467,26 @@ VarMethodSet.prototype._invokeMembers = function(context, node) {
     var result = member.invoke$4(context, node, target, this.args);
     var stub = new VarMethodStub(this.name, member, this.args, result);
     var type = member.declaringType;
-    if ($ne(type.get$library(), world.get$dom()) && !$notnull_bool(type.get$isObject())) {
+    if ($notnull_bool(type.get$isObject())) {
+      objectStub = stub;
+    }
+    else if ($ne(type.get$library(), world.get$dom())) {
       VarMethodSet._addVarStub((type && type.is$lang_Type()), (stub && stub.is$VarMember()));
     }
     else {
       this._fallbackStubs.add(stub);
     }
   }
-  var target = new Value(world.objectType, 'this', node.span, true);
-  var result = target.invokeNoSuchMethod(context, this.get$baseName(), node, this.args);
-  var stub = new VarMethodStub(this.name, null, this.args, result);
+  if ($notnull_bool(objectStub == null)) {
+    var target = new Value(world.objectType, 'this', node.span, true);
+    var result = target.invokeNoSuchMethod(context, this.get$baseName(), node, this.args);
+    objectStub = new VarMethodStub(this.name, null, this.args, result);
+  }
   if (this._fallbackStubs.length == 0) {
-    VarMethodSet._addVarStub(world.objectType, (stub && stub.is$VarMember()));
+    VarMethodSet._addVarStub(world.objectType, (objectStub && objectStub.is$VarMember()));
   }
   else {
-    this._fallbackStubs.add(stub);
+    this._fallbackStubs.add(objectStub);
     world.gen.corejs.useVarMethod = true;
   }
 }
@@ -20605,20 +22497,21 @@ VarMethodSet._addVarStub = function(type, stub) {
 VarMethodSet.prototype.generate = function(code) {
   if (this._fallbackStubs.length == 0) return;
   code.enterBlock(('\$varMethod("' + this.name + '", {'));
-  var lastOne = this._fallbackStubs.$index(this._fallbackStubs.length - 1);
+  var lastOne = this._fallbackStubs.last();
   var $list = this._fallbackStubs;
   for (var $i = 0;$i < $list.length; $i++) {
     var stub = $list.$index($i);
     code.write(('"' + stub.get$typeName() + '": '));
-    stub.generateBody(code);
-    code.writeln($notnull_bool($eq(stub, lastOne)) ? '' : ',');
+    stub.generateBody$2(code, $notnull_bool($eq(stub, lastOne)) ? '' : ',');
   }
   code.exitBlock('});');
 }
+VarMethodSet.prototype.generate$1 = function($0) {
+  return this.generate(($0 && $0.is$CodeWriter()));
+};
 VarMethodSet.prototype.invoke$4 = function($0, $1, $2, $3) {
   return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()));
-}
-;
+};
 // ********** Code for top level **************
 function map(source, mapper) {
   var result = new ListFactory();
@@ -20631,8 +22524,8 @@ function map(source, mapper) {
     }
   }
   else {
-    for (var $i = source.iterator(); $i.hasNext(); ) {
-      var item = $i.next();
+    for (var $i = source.iterator(); $i.hasNext$0(); ) {
+      var item = $i.next$0();
       result.add(mapper(item));
     }
   }
@@ -20641,11 +22534,11 @@ function map(source, mapper) {
 function reduce(source, callback, initialValue) {
   var i = source.iterator();
   var current = initialValue;
-  if ($notnull_bool(current == null && i.hasNext())) {
-    current = i.next();
+  if ($notnull_bool(current == null && i.hasNext$0())) {
+    current = i.next$0();
   }
-  while ($notnull_bool(i.hasNext())) {
-    current = callback.call$2(current, i.next());
+  while ($notnull_bool(i.hasNext$0())) {
+    current = callback.call$2(current, i.next$0());
   }
   return current;
 }
@@ -20653,7 +22546,7 @@ function orderValuesByKeys(map) {
   var $0;
   var keys = (($0 = map.getKeys()) && $0.is$List());
   keys.sort((function (x, y) {
-    return x.compareTo(y);
+    return x.compareTo$1(y);
   })
   );
   var values = [];
@@ -20758,72 +22651,71 @@ function main() {
 }
 //  ********** Globals **************
 var const$0 = new NoMoreElementsException()/*const NoMoreElementsException()*/;
-var const$10 = new StringWrapper('Dynamic')/*const SourceString('Dynamic')*/;
-var const$12 = new StringWrapper('String')/*const SourceString('String')*/;
-var const$14 = new IllegalAccessException()/*const IllegalAccessException()*/;
-var const$146 = new Keyword("break", false)/*const Keyword("break")*/;
-var const$148 = new Keyword("case", false)/*const Keyword("case")*/;
-var const$15 = ImmutableList.ImmutableList$from$factory([])/*const []*/;
-var const$150 = new Keyword("catch", false)/*const Keyword("catch")*/;
-var const$152 = new Keyword("const", false)/*const Keyword("const")*/;
-var const$154 = new Keyword("continue", false)/*const Keyword("continue")*/;
-var const$156 = new Keyword("default", false)/*const Keyword("default")*/;
-var const$158 = new Keyword("do", false)/*const Keyword("do")*/;
-var const$16 = new LinkTail()/*const EmptyLink()*/;
-var const$160 = new Keyword("else", false)/*const Keyword("else")*/;
-var const$162 = new Keyword("false", false)/*const Keyword("false")*/;
-var const$164 = new Keyword("final", false)/*const Keyword("final")*/;
-var const$166 = new Keyword("finally", false)/*const Keyword("finally")*/;
-var const$168 = new Keyword("for", false)/*const Keyword("for")*/;
-var const$170 = new Keyword("if", false)/*const Keyword("if")*/;
-var const$172 = new Keyword("in", false)/*const Keyword("in")*/;
-var const$174 = new Keyword("is", false)/*const Keyword("is")*/;
-var const$176 = new Keyword("new", false)/*const Keyword("new")*/;
-var const$178 = new Keyword("null", false)/*const Keyword("null")*/;
-var const$180 = new Keyword("return", false)/*const Keyword("return")*/;
-var const$182 = new Keyword("super", false)/*const Keyword("super")*/;
-var const$184 = new Keyword("switch", false)/*const Keyword("switch")*/;
-var const$186 = new Keyword("this", false)/*const Keyword("this")*/;
-var const$188 = new Keyword("throw", false)/*const Keyword("throw")*/;
-var const$190 = new Keyword("true", false)/*const Keyword("true")*/;
-var const$192 = new Keyword("try", false)/*const Keyword("try")*/;
-var const$194 = new Keyword("var", false)/*const Keyword("var")*/;
-var const$196 = new Keyword("void", false)/*const Keyword("void")*/;
-var const$198 = new Keyword("while", false)/*const Keyword("while")*/;
-var const$2 = new StringWrapper('global scope')/*const SourceString('global scope')*/;
-var const$200 = new Keyword("abstract", true)/*const Keyword("abstract", true)*/;
-var const$202 = new Keyword("assert", true)/*const Keyword("assert", true)*/;
-var const$204 = new Keyword("class", true)/*const Keyword("class", true)*/;
-var const$206 = new Keyword("extends", true)/*const Keyword("extends", true)*/;
-var const$208 = new Keyword("factory", true)/*const Keyword("factory", true)*/;
-var const$210 = new Keyword("get", true)/*const Keyword("get", true)*/;
-var const$212 = new Keyword("implements", true)/*const Keyword("implements", true)*/;
-var const$214 = new Keyword("import", true)/*const Keyword("import", true)*/;
-var const$216 = new Keyword("interface", true)/*const Keyword("interface", true)*/;
-var const$218 = new Keyword("library", true)/*const Keyword("library", true)*/;
-var const$220 = new Keyword("native", true)/*const Keyword("native", true)*/;
-var const$222 = new Keyword("negate", true)/*const Keyword("negate", true)*/;
-var const$224 = new Keyword("operator", true)/*const Keyword("operator", true)*/;
-var const$226 = new Keyword("set", true)/*const Keyword("set", true)*/;
-var const$228 = new Keyword("source", true)/*const Keyword("source", true)*/;
-var const$230 = new Keyword("static", true)/*const Keyword("static", true)*/;
-var const$232 = new Keyword("typedef", true)/*const Keyword("typedef", true)*/;
-var const$236 = new StringWrapper('EOF')/*const SourceString('EOF')*/;
-var const$239 = new ElementKind('class')/*const ElementKind('class')*/;
-var const$241 = new ElementKind('function')/*const ElementKind('function')*/;
-var const$243 = new StringWrapper('JS')/*const SourceString('JS')*/;
-var const$244 = new ElementKind('foreign')/*const ElementKind('foreign')*/;
-var const$246 = new ImmutableMap([])/*const {}*/;
-var const$247 = new StringWrapper('+')/*const SourceString('+')*/;
-var const$248 = new StringWrapper('-')/*const SourceString('-')*/;
-var const$249 = new StringWrapper('*')/*const SourceString('*')*/;
-var const$250 = new StringWrapper('/')/*const SourceString('/')*/;
-var const$251 = new StringWrapper('<')/*const SourceString('<')*/;
-var const$252 = new StringWrapper('~/')/*const SourceString('~/')*/;
-var const$253 = new StringWrapper('==')/*const SourceString('==')*/;
-var const$254 = new StringWrapper('var')/*const SourceString('var')*/;
-var const$255 = new ElementKind('variable')/*const ElementKind('variable')*/;
-var const$257 = new StringWrapper('=')/*const SourceString('=')*/;
+var const$10 = new StringWrapper('void')/*const SourceString('void')*/;
+var const$12 = new StringWrapper('int')/*const SourceString('int')*/;
+var const$14 = new StringWrapper('Dynamic')/*const SourceString('Dynamic')*/;
+var const$148 = new Keyword("break", false)/*const Keyword("break")*/;
+var const$150 = new Keyword("case", false)/*const Keyword("case")*/;
+var const$152 = new Keyword("catch", false)/*const Keyword("catch")*/;
+var const$154 = new Keyword("const", false)/*const Keyword("const")*/;
+var const$156 = new Keyword("continue", false)/*const Keyword("continue")*/;
+var const$158 = new Keyword("default", false)/*const Keyword("default")*/;
+var const$16 = new StringWrapper('String')/*const SourceString('String')*/;
+var const$160 = new Keyword("do", false)/*const Keyword("do")*/;
+var const$162 = new Keyword("else", false)/*const Keyword("else")*/;
+var const$164 = new Keyword("false", false)/*const Keyword("false")*/;
+var const$166 = new Keyword("final", false)/*const Keyword("final")*/;
+var const$168 = new Keyword("finally", false)/*const Keyword("finally")*/;
+var const$170 = new Keyword("for", false)/*const Keyword("for")*/;
+var const$172 = new Keyword("if", false)/*const Keyword("if")*/;
+var const$174 = new Keyword("in", false)/*const Keyword("in")*/;
+var const$176 = new Keyword("is", false)/*const Keyword("is")*/;
+var const$178 = new Keyword("new", false)/*const Keyword("new")*/;
+var const$18 = new LinkTail()/*const EmptyLink()*/;
+var const$180 = new Keyword("null", false)/*const Keyword("null")*/;
+var const$182 = new Keyword("return", false)/*const Keyword("return")*/;
+var const$184 = new Keyword("super", false)/*const Keyword("super")*/;
+var const$186 = new Keyword("switch", false)/*const Keyword("switch")*/;
+var const$188 = new Keyword("this", false)/*const Keyword("this")*/;
+var const$190 = new Keyword("throw", false)/*const Keyword("throw")*/;
+var const$192 = new Keyword("true", false)/*const Keyword("true")*/;
+var const$194 = new Keyword("try", false)/*const Keyword("try")*/;
+var const$196 = new Keyword("var", false)/*const Keyword("var")*/;
+var const$198 = new Keyword("void", false)/*const Keyword("void")*/;
+var const$200 = new Keyword("while", false)/*const Keyword("while")*/;
+var const$202 = new Keyword("abstract", true)/*const Keyword("abstract", true)*/;
+var const$204 = new Keyword("assert", true)/*const Keyword("assert", true)*/;
+var const$206 = new Keyword("class", true)/*const Keyword("class", true)*/;
+var const$208 = new Keyword("extends", true)/*const Keyword("extends", true)*/;
+var const$210 = new Keyword("factory", true)/*const Keyword("factory", true)*/;
+var const$212 = new Keyword("get", true)/*const Keyword("get", true)*/;
+var const$214 = new Keyword("implements", true)/*const Keyword("implements", true)*/;
+var const$216 = new Keyword("import", true)/*const Keyword("import", true)*/;
+var const$218 = new Keyword("interface", true)/*const Keyword("interface", true)*/;
+var const$220 = new Keyword("library", true)/*const Keyword("library", true)*/;
+var const$222 = new Keyword("native", true)/*const Keyword("native", true)*/;
+var const$224 = new Keyword("negate", true)/*const Keyword("negate", true)*/;
+var const$226 = new Keyword("operator", true)/*const Keyword("operator", true)*/;
+var const$228 = new Keyword("set", true)/*const Keyword("set", true)*/;
+var const$230 = new Keyword("source", true)/*const Keyword("source", true)*/;
+var const$232 = new Keyword("static", true)/*const Keyword("static", true)*/;
+var const$234 = new Keyword("typedef", true)/*const Keyword("typedef", true)*/;
+var const$238 = new StringWrapper('EOF')/*const SourceString('EOF')*/;
+var const$241 = new ElementKind('class')/*const ElementKind('class')*/;
+var const$243 = new ElementKind('function')/*const ElementKind('function')*/;
+var const$245 = new StringWrapper('JS')/*const SourceString('JS')*/;
+var const$246 = new ElementKind('foreign')/*const ElementKind('foreign')*/;
+var const$248 = new ImmutableMap([])/*const {}*/;
+var const$249 = new StringWrapper('+')/*const SourceString('+')*/;
+var const$250 = new StringWrapper('-')/*const SourceString('-')*/;
+var const$251 = new StringWrapper('*')/*const SourceString('*')*/;
+var const$252 = new StringWrapper('/')/*const SourceString('/')*/;
+var const$253 = new StringWrapper('<')/*const SourceString('<')*/;
+var const$254 = new StringWrapper('~/')/*const SourceString('~/')*/;
+var const$255 = new StringWrapper('==')/*const SourceString('==')*/;
+var const$256 = new StringWrapper('var')/*const SourceString('var')*/;
+var const$257 = new ElementKind('variable')/*const ElementKind('variable')*/;
+var const$259 = new StringWrapper('=')/*const SourceString('=')*/;
 var const$266 = new StringWrapper("+")/*const SourceString("+")*/;
 var const$267 = new StringWrapper("-")/*const SourceString("-")*/;
 var const$268 = new StringWrapper("*")/*const SourceString("*")*/;
@@ -20837,15 +22729,16 @@ var const$277 = new StringWrapper('\$eq')/*const SourceString('\$eq')*/;
 var const$278 = new StringWrapper('\$mul')/*const SourceString('\$mul')*/;
 var const$279 = new StringWrapper('\$sub')/*const SourceString('\$sub')*/;
 var const$280 = new StringWrapper('\$tdiv')/*const SourceString('\$tdiv')*/;
-var const$3 = new StringWrapper('main')/*const SourceString('main')*/;
+var const$4 = new IllegalAccessException()/*const IllegalAccessException()*/;
 var const$403 = ImmutableList.ImmutableList$from$factory(['NullPointerException', 'ObjectNotClosureException', 'NoSuchMethodException', 'StackOverflowException'])/*const [
       'NullPointerException', 'ObjectNotClosureException',
       'NoSuchMethodException', 'StackOverflowException']*/;
-var const$5 = new EmptyQueueException()/*const EmptyQueueException()*/;
-var const$6 = new StringWrapper('void')/*const SourceString('void')*/;
-var const$8 = new StringWrapper('int')/*const SourceString('int')*/;
+var const$5 = ImmutableList.ImmutableList$from$factory([])/*const <HInstruction>[]*/;
+var const$6 = new StringWrapper('global scope')/*const SourceString('global scope')*/;
+var const$7 = new StringWrapper('main')/*const SourceString('main')*/;
+var const$9 = new EmptyQueueException()/*const EmptyQueueException()*/;
 HTracer._singleton = null;
-var const$234 = ImmutableList.ImmutableList$from$factory([const$146, const$148, const$150, const$152, const$154, const$156, const$158, const$160, const$162, const$164, const$166, const$168, const$170, const$172, const$174, const$176, const$178, const$180, const$182, const$184, const$186, const$188, const$190, const$192, const$194, const$196, const$198, const$200, const$202, const$204, const$206, const$208, const$210, const$212, const$214, const$216, const$218, const$220, const$222, const$224, const$226, const$228, const$230, const$232])/*const <Keyword> [
+var const$236 = ImmutableList.ImmutableList$from$factory([const$148, const$150, const$152, const$154, const$156, const$158, const$160, const$162, const$164, const$166, const$168, const$170, const$172, const$174, const$176, const$178, const$180, const$182, const$184, const$186, const$188, const$190, const$192, const$194, const$196, const$198, const$200, const$202, const$204, const$206, const$208, const$210, const$212, const$214, const$216, const$218, const$220, const$222, const$224, const$226, const$228, const$230, const$232, const$234])/*const <Keyword> [
       BREAK,
       CASE,
       CATCH,