diff --git a/.idea/artifacts/dart_ast_src.xml b/.idea/artifacts/dart_ast_src.xml
new file mode 100644
index 00000000000..97361010d7c
--- /dev/null
+++ b/.idea/artifacts/dart_ast_src.xml
@@ -0,0 +1,10 @@
+<component name="ArtifactManager">
+  <artifact build-on-make="true" name="dart-ast-src">
+    <output-path>$PROJECT_DIR$/out/artifacts</output-path>
+    <root id="root">
+      <element id="archive" name="dart-ast-src.jar">
+        <element id="dir-copy" path="$PROJECT_DIR$/src" />
+      </element>
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java b/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java
index 50d29b64e08..49b0c2bd610 100644
--- a/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java
+++ b/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java
@@ -200,7 +200,7 @@ public class JsToStringGenerationVisitor extends JsVisitor {
     private TIntArrayList statementStarts = new TIntArrayList();
 
     public JsToStringGenerationVisitor(TextOutput out) {
-        this.p = out;
+        p = out;
     }
 
     @Override
@@ -1252,10 +1252,7 @@ public class JsToStringGenerationVisitor extends JsVisitor {
             * If the binary operation has a higher precedence than op, then it won't
             * be parenthesized, so check the first argument of the binary operation.
             */
-            if (binary.getOperator().getPrecedence() > op.getPrecedence()) {
-                return spaceCalc(op, binary.getArg1());
-            }
-            return false;
+            return binary.getOperator().getPrecedence() > op.getPrecedence() && spaceCalc(op, binary.getArg1());
         }
         if (arg instanceof JsPrefixOperation) {
             JsOperator op2 = ((JsPrefixOperation) arg).getOperator();
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java b/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java
index c85c088d1f9..6a6eefdd3e0 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java
@@ -53,12 +53,12 @@ public final class JsArrayAccess extends JsExpressionImpl {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    if (v.visit(this, ctx)) {
+  public void traverse(JsVisitor v, JsContext context) {
+    if (v.visit(this, context)) {
       arrayExpr = v.accept(arrayExpr);
       indexExpr = v.accept(indexExpr);
     }
-    v.endVisit(this, ctx);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java b/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java
index 558a02245eb..5c1a8bcdb00 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java
@@ -57,11 +57,11 @@ public final class JsArrayLiteral extends JsLiteral {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             v.acceptWithInsertRemove(expressions);
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java b/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java
index fc1513a74eb..9b6327f74c0 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java
@@ -81,8 +81,8 @@ public final class JsBinaryOperation extends JsExpressionImpl {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    if (v.visit(this, ctx)) {
+  public void traverse(JsVisitor v, JsContext context) {
+    if (v.visit(this, context)) {
       if (op.isAssignment()) {
         arg1 = v.acceptLvalue(arg1);
       } else {
@@ -90,7 +90,7 @@ public final class JsBinaryOperation extends JsExpressionImpl {
       }
       arg2 = v.accept(arg2);
     }
-    v.endVisit(this, ctx);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsBlock.java b/src/com/google/dart/compiler/backend/js/ast/JsBlock.java
index cad730b4b5c..633d88f72b2 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsBlock.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsBlock.java
@@ -44,11 +44,11 @@ public class JsBlock extends JsNodeImpl implements JsStatement {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             v.acceptWithInsertRemove(statements);
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsBreak.java b/src/com/google/dart/compiler/backend/js/ast/JsBreak.java
index ce1c9e66f2d..3360bcb7b2f 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsBreak.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsBreak.java
@@ -22,12 +22,12 @@ public final class JsBreak extends JsContinue {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             if (label != null) {
                 v.accept(label);
             }
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 }
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsCase.java b/src/com/google/dart/compiler/backend/js/ast/JsCase.java
index a8b881b41cc..e1598a509d6 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsCase.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsCase.java
@@ -24,12 +24,12 @@ public final class JsCase extends JsSwitchMember {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    if (v.visit(this, ctx)) {
+  public void traverse(JsVisitor v, JsContext context) {
+    if (v.visit(this, context)) {
       caseExpr = v.accept(caseExpr);
       v.acceptWithInsertRemove(statements);
     }
-    v.endVisit(this, ctx);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsCatch.java b/src/com/google/dart/compiler/backend/js/ast/JsCatch.java
index fc97ad4df4c..1d3846fa6f0 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsCatch.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsCatch.java
@@ -48,15 +48,15 @@ public class JsCatch extends JsNodeImpl implements HasCondition {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    if (v.visit(this, ctx)) {
+  public void traverse(JsVisitor v, JsContext context) {
+    if (v.visit(this, context)) {
       param = v.accept(param);
       if (condition != null) {
         condition = v.accept(condition);
       }
       body = v.accept(body);
     }
-    v.endVisit(this, ctx);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsConditional.java b/src/com/google/dart/compiler/backend/js/ast/JsConditional.java
index 5b98b278b5e..2bf2dda635e 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsConditional.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsConditional.java
@@ -61,13 +61,13 @@ public final class JsConditional extends JsExpressionImpl {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             testExpr = v.accept(testExpr);
             thenExpr = v.accept(thenExpr);
             elseExpr = v.accept(elseExpr);
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsContinue.java b/src/com/google/dart/compiler/backend/js/ast/JsContinue.java
index 89396dc89a8..65e88f25932 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsContinue.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsContinue.java
@@ -26,13 +26,13 @@ public class JsContinue extends JsNodeImpl implements JsStatement {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             if (label != null) {
                 v.accept(label);
             }
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsDebugger.java b/src/com/google/dart/compiler/backend/js/ast/JsDebugger.java
index fe9900e134a..45db05149a8 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsDebugger.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsDebugger.java
@@ -13,9 +13,9 @@ public class JsDebugger extends JsNodeImpl implements JsStatement {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    v.visit(this, ctx);
-    v.endVisit(this, ctx);
+  public void traverse(JsVisitor v, JsContext context) {
+    v.visit(this, context);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsDefault.java b/src/com/google/dart/compiler/backend/js/ast/JsDefault.java
index 89624ddd683..b59dca783a9 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsDefault.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsDefault.java
@@ -14,11 +14,11 @@ public final class JsDefault extends JsSwitchMember {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    if (v.visit(this, ctx)) {
+  public void traverse(JsVisitor v, JsContext context) {
+    if (v.visit(this, context)) {
       v.acceptWithInsertRemove(statements);
     }
-    v.endVisit(this, ctx);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java b/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java
index 44f25010e07..10253c39b55 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java
@@ -21,11 +21,11 @@ public class JsDoWhile extends JsWhile {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             condition = v.accept(condition);
             body = v.accept(body);
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 }
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsDocComment.java b/src/com/google/dart/compiler/backend/js/ast/JsDocComment.java
new file mode 100644
index 00000000000..e66ea3eb2f0
--- /dev/null
+++ b/src/com/google/dart/compiler/backend/js/ast/JsDocComment.java
@@ -0,0 +1,13 @@
+package com.google.dart.compiler.backend.js.ast;
+
+public class JsDocComment extends JsNodeImpl implements JsStatement {
+    @Override
+    public NodeKind getKind() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
+    public void traverse(JsVisitor visitor, JsContext context) {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+}
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsEmpty.java b/src/com/google/dart/compiler/backend/js/ast/JsEmpty.java
index 188676e0ddd..3ecc8f1d3bc 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsEmpty.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsEmpty.java
@@ -13,9 +13,9 @@ public class JsEmpty extends JsNodeImpl implements JsStatement {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    v.visit(this, ctx);
-    v.endVisit(this, ctx);
+  public void traverse(JsVisitor v, JsContext context) {
+    v.visit(this, context);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsExprStmt.java b/src/com/google/dart/compiler/backend/js/ast/JsExprStmt.java
index 0ad3a6c74b5..6ab649f2cb4 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsExprStmt.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsExprStmt.java
@@ -18,11 +18,11 @@ public final class JsExprStmt extends JsNodeImpl implements JsStatement {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             expr = v.accept(expr);
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsFor.java b/src/com/google/dart/compiler/backend/js/ast/JsFor.java
index ccf61b77954..65f24607696 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsFor.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsFor.java
@@ -63,8 +63,8 @@ public class JsFor extends JsNodeImpl implements JsStatement {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             assert (!(initExpr != null && initVars != null));
 
             if (initExpr != null) {
@@ -83,7 +83,7 @@ public class JsFor extends JsNodeImpl implements JsStatement {
             }
             body = v.accept(body);
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsForIn.java b/src/com/google/dart/compiler/backend/js/ast/JsForIn.java
index 048fb02b25c..a0e31f4af5b 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsForIn.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsForIn.java
@@ -53,15 +53,15 @@ public class JsForIn extends JsNodeImpl implements JsStatement {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    if (v.visit(this, ctx)) {
+  public void traverse(JsVisitor v, JsContext context) {
+    if (v.visit(this, context)) {
       if (iterExpr != null) {
         iterExpr = v.acceptLvalue(iterExpr);
       }
       objExpr = v.accept(objExpr);
       body = v.accept(body);
     }
-    v.endVisit(this, ctx);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsFunction.java b/src/com/google/dart/compiler/backend/js/ast/JsFunction.java
index 8a55f90b79d..a4e9914100d 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsFunction.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsFunction.java
@@ -91,12 +91,12 @@ public final class JsFunction extends JsLiteral implements HasName {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             v.acceptWithInsertRemove(params);
             body = v.accept(body);
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsIf.java b/src/com/google/dart/compiler/backend/js/ast/JsIf.java
index 1722bc525c7..ad75b9b2a2d 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsIf.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsIf.java
@@ -38,28 +38,28 @@ public final class JsIf extends JsNodeImpl implements JsStatement {
         return thenStatement;
     }
 
-    public void setElseStatement(JsStatement elseStmt) {
-        this.elseStatement = elseStmt;
+    public void setElseStatement(JsStatement elseStatement) {
+        this.elseStatement = elseStatement;
     }
 
-    public void setIfExpression(JsExpression ifExpr) {
-        this.ifExpression = ifExpr;
+    public void setIfExpression(JsExpression ifExpression) {
+        this.ifExpression = ifExpression;
     }
 
-    public void setThenStatement(JsStatement thenStmt) {
-        this.thenStatement = thenStmt;
+    public void setThenStatement(JsStatement thenStatement) {
+        this.thenStatement = thenStatement;
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             ifExpression = v.accept(ifExpression);
             thenStatement = v.accept(thenStatement);
             if (elseStatement != null) {
                 elseStatement = v.accept(elseStatement);
             }
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java b/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java
index 1856dcc6dad..96b9f8e5cec 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java
@@ -68,12 +68,12 @@ public final class JsInvocation extends JsExpressionImpl implements HasArguments
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             qualifier = v.accept(qualifier);
             v.acceptList(arguments);
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsLabel.java b/src/com/google/dart/compiler/backend/js/ast/JsLabel.java
index f9817ee3390..040434b95b6 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsLabel.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsLabel.java
@@ -38,11 +38,11 @@ public class JsLabel extends JsNodeImpl implements JsStatement, HasName {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    if (v.visit(this, ctx)) {
+  public void traverse(JsVisitor v, JsContext context) {
+    if (v.visit(this, context)) {
       stmt = v.accept(stmt);
     }
-    v.endVisit(this, ctx);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsLiteral.java b/src/com/google/dart/compiler/backend/js/ast/JsLiteral.java
index eb00aab6e36..f8cc734d453 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsLiteral.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsLiteral.java
@@ -43,9 +43,9 @@ public abstract class JsLiteral extends JsExpressionImpl implements CanBooleanEv
         }
 
         @Override
-        public void traverse(JsVisitor v, JsContext ctx) {
-            v.visit(this, ctx);
-            v.endVisit(this, ctx);
+        public void traverse(JsVisitor v, JsContext context) {
+            v.visit(this, context);
+            v.endVisit(this, context);
         }
 
         @Override
@@ -87,9 +87,9 @@ public abstract class JsLiteral extends JsExpressionImpl implements CanBooleanEv
       }
 
       @Override
-      public void traverse(JsVisitor v, JsContext ctx) {
-        v.visit(this, ctx);
-        v.endVisit(this, ctx);
+      public void traverse(JsVisitor v, JsContext context) {
+        v.visit(this, context);
+        v.endVisit(this, context);
       }
 
       @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java b/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java
index 54d1a923aa1..1f12ed8c628 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java
@@ -109,13 +109,13 @@ public final class JsNameRef extends JsExpressionImpl implements CanBooleanEval,
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             if (qualifier != null) {
                 qualifier = v.accept(qualifier);
             }
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsNew.java b/src/com/google/dart/compiler/backend/js/ast/JsNew.java
index 68ffb540ca5..c65bebbde66 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsNew.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsNew.java
@@ -51,12 +51,12 @@ public final class JsNew extends JsExpressionImpl implements HasArguments {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             ctorExpression = v.accept(ctorExpression);
             v.acceptList(arguments);
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsNodeImpl.java b/src/com/google/dart/compiler/backend/js/ast/JsNodeImpl.java
index e96a902c178..583f0e7de08 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsNodeImpl.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsNodeImpl.java
@@ -1,6 +1,5 @@
 package com.google.dart.compiler.backend.js.ast;
 
-import com.google.dart.compiler.backend.js.JsSourceGenerationVisitor;
 import com.google.dart.compiler.backend.js.JsToStringGenerationVisitor;
 import com.google.dart.compiler.common.AbstractNode;
 import com.google.dart.compiler.common.SourceInfo;
@@ -10,20 +9,10 @@ abstract class JsNodeImpl extends AbstractNode implements JsNode {
     protected JsNodeImpl() {
     }
 
-    // Causes source generation to delegate to the one visitor
-    public final String toSource() {
-        TextOutputImpl out = new TextOutputImpl();
-        JsSourceGenerationVisitor v = new JsSourceGenerationVisitor(out);
-        v.accept(this);
-        return out.toString();
-    }
-
-    // Causes source generation to delegate to the one visitor
     @Override
     public String toString() {
         TextOutputImpl out = new TextOutputImpl();
-        JsToStringGenerationVisitor v = new JsToStringGenerationVisitor(out);
-        v.accept(this);
+        new JsToStringGenerationVisitor(out).accept(this);
         return out.toString();
     }
 
@@ -34,7 +23,7 @@ abstract class JsNodeImpl extends AbstractNode implements JsNode {
 
     public JsNode setSourceRef(SourceInfo info) {
         if (info != null) {
-            this.setSourceInfo(info);
+            setSourceInfo(info);
         }
         return this;
     }
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsNullLiteral.java b/src/com/google/dart/compiler/backend/js/ast/JsNullLiteral.java
index 0514fb0df89..028760e4c0d 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsNullLiteral.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsNullLiteral.java
@@ -29,9 +29,9 @@ public final class JsNullLiteral extends JsValueLiteral {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        v.visit(this, ctx);
-        v.endVisit(this, ctx);
+    public void traverse(JsVisitor v, JsContext context) {
+        v.visit(this, context);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsNumberLiteral.java b/src/com/google/dart/compiler/backend/js/ast/JsNumberLiteral.java
index e191e7e8954..8d47eca2dcf 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsNumberLiteral.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsNumberLiteral.java
@@ -38,9 +38,9 @@ public abstract class JsNumberLiteral extends JsValueLiteral {
         }
 
         @Override
-        public void traverse(JsVisitor v, JsContext ctx) {
-            v.visit(this, ctx);
-            v.endVisit(this, ctx);
+        public void traverse(JsVisitor v, JsContext context) {
+            v.visit(this, context);
+            v.endVisit(this, context);
         }
 
         public String toString() {
@@ -66,9 +66,9 @@ public abstract class JsNumberLiteral extends JsValueLiteral {
         }
 
         @Override
-        public void traverse(JsVisitor v, JsContext ctx) {
-            v.visit(this, ctx);
-            v.endVisit(this, ctx);
+        public void traverse(JsVisitor v, JsContext context) {
+            v.visit(this, context);
+            v.endVisit(this, context);
         }
 
         public String toString() {
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java b/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java
index b0353a3d3bd..f1ef5b54bfd 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java
@@ -69,11 +69,11 @@ public final class JsObjectLiteral extends JsLiteral {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             v.acceptWithInsertRemove(properties);
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsParameter.java b/src/com/google/dart/compiler/backend/js/ast/JsParameter.java
index fbb0908e69f..323646468c6 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsParameter.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsParameter.java
@@ -27,9 +27,9 @@ public final class JsParameter extends JsNodeImpl implements HasName {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    v.visit(this, ctx);
-    v.endVisit(this, ctx);
+  public void traverse(JsVisitor v, JsContext context) {
+    v.visit(this, context);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java b/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java
index a33536f6c0d..d32565dfc0b 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java
@@ -28,11 +28,11 @@ public final class JsPostfixOperation extends JsUnaryOperation {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    if (v.visit(this, ctx)) {
-      super.traverse(v, ctx);
+  public void traverse(JsVisitor v, JsContext context) {
+    if (v.visit(this, context)) {
+      super.traverse(v, context);
     }
-    v.endVisit(this, ctx);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java b/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java
index 8ce12c7bacd..e66e6883eb3 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java
@@ -55,11 +55,11 @@ public final class JsPrefixOperation extends JsUnaryOperation implements CanBool
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    if (v.visit(this, ctx)) {
-      super.traverse(v, ctx);
+  public void traverse(JsVisitor v, JsContext context) {
+    if (v.visit(this, context)) {
+      super.traverse(v, context);
     }
-    v.endVisit(this, ctx);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsProgram.java b/src/com/google/dart/compiler/backend/js/ast/JsProgram.java
index afea24a93ca..c22f4a3f542 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsProgram.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsProgram.java
@@ -112,13 +112,13 @@ public final class JsProgram extends JsNodeImpl {
     }
 
     @Override
-    public void traverse(JsVisitor v, @Nullable JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, @Nullable JsContext context) {
+        if (v.visit(this, context)) {
             for (JsProgramFragment fragment : fragments) {
                 v.accept(fragment);
             }
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsProgramFragment.java b/src/com/google/dart/compiler/backend/js/ast/JsProgramFragment.java
index 3a291556f66..a89da4065a6 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsProgramFragment.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsProgramFragment.java
@@ -20,11 +20,11 @@ public class JsProgramFragment extends JsNodeImpl {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    if (v.visit(this, ctx)) {
+  public void traverse(JsVisitor v, JsContext context) {
+    if (v.visit(this, context)) {
       v.accept(globalBlock);
     }
-    v.endVisit(this, ctx);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java b/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java
index 0a8d3e2467d..d2a212c9145 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java
@@ -39,12 +39,12 @@ public class JsPropertyInitializer extends JsNodeImpl {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             labelExpr = v.accept(labelExpr);
             valueExpr = v.accept(valueExpr);
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsRegExp.java b/src/com/google/dart/compiler/backend/js/ast/JsRegExp.java
index 158c7a5e092..3bcc404b892 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsRegExp.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsRegExp.java
@@ -52,9 +52,9 @@ public final class JsRegExp extends JsValueLiteral {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    v.visit(this, ctx);
-    v.endVisit(this, ctx);
+  public void traverse(JsVisitor v, JsContext context) {
+    v.visit(this, context);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsReturn.java b/src/com/google/dart/compiler/backend/js/ast/JsReturn.java
index b8806c82bab..a09421806ec 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsReturn.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsReturn.java
@@ -27,13 +27,13 @@ public final class JsReturn extends JsNodeImpl implements JsStatement {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    if (v.visit(this, ctx)) {
+  public void traverse(JsVisitor v, JsContext context) {
+    if (v.visit(this, context)) {
       if (expr != null) {
         expr = v.accept(expr);
       }
     }
-    v.endVisit(this, ctx);
+    v.endVisit(this, context);
   }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsStringLiteral.java b/src/com/google/dart/compiler/backend/js/ast/JsStringLiteral.java
index 77e60c9b89a..3cff1258798 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsStringLiteral.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsStringLiteral.java
@@ -41,9 +41,9 @@ public final class JsStringLiteral extends JsValueLiteral {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    v.visit(this, ctx);
-    v.endVisit(this, ctx);
+  public void traverse(JsVisitor v, JsContext context) {
+    v.visit(this, context);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java b/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java
index 4e76da8d939..683dd195941 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java
@@ -32,12 +32,12 @@ public class JsSwitch extends JsNodeImpl implements JsStatement {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
-    if (v.visit(this, ctx)) {
+  public void traverse(JsVisitor v, JsContext context) {
+    if (v.visit(this, context)) {
       expr = v.accept(expr);
       v.acceptWithInsertRemove(cases);
     }
-    v.endVisit(this, ctx);
+    v.endVisit(this, context);
   }
 
   @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsThrow.java b/src/com/google/dart/compiler/backend/js/ast/JsThrow.java
index f6b8f1987f8..2c7867056f3 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsThrow.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsThrow.java
@@ -23,11 +23,11 @@ public class JsThrow extends JsNodeImpl implements JsStatement {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             expression = v.accept(expression);
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsTry.java b/src/com/google/dart/compiler/backend/js/ast/JsTry.java
index 2a3b78607b6..cd0fde570f5 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsTry.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsTry.java
@@ -48,15 +48,15 @@ public class JsTry extends JsNodeImpl implements JsStatement {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             tryBlock = v.accept(tryBlock);
             v.acceptWithInsertRemove(catches);
             if (finallyBlock != null) {
                 finallyBlock = v.accept(finallyBlock);
             }
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperation.java b/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperation.java
index 6f3ee93273d..669fe9a0a78 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperation.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperation.java
@@ -41,7 +41,7 @@ public abstract class JsUnaryOperation extends JsExpressionImpl {
   }
 
   @Override
-  public void traverse(JsVisitor v, JsContext ctx) {
+  public void traverse(JsVisitor v, JsContext context) {
     if (op.isModifying()) {
       // The delete operator is practically like an assignment of undefined, so
       // for practical purposes we're treating it as an lvalue.
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsVars.java b/src/com/google/dart/compiler/backend/js/ast/JsVars.java
index d02c932715a..18617861955 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsVars.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsVars.java
@@ -82,13 +82,13 @@ public class JsVars extends JsNodeImpl implements JsStatement, Iterable<JsVars.J
         }
 
         @Override
-        public void traverse(JsVisitor v, JsContext ctx) {
-            if (v.visit(this, ctx)) {
+        public void traverse(JsVisitor v, JsContext context) {
+            if (v.visit(this, context)) {
                 if (initExpression != null) {
                     initExpression = v.accept(initExpression);
                 }
             }
-            v.endVisit(this, ctx);
+            v.endVisit(this, context);
         }
 
         @Override
@@ -123,11 +123,11 @@ public class JsVars extends JsNodeImpl implements JsStatement, Iterable<JsVars.J
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             v.acceptWithInsertRemove(vars);
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsVisitable.java b/src/com/google/dart/compiler/backend/js/ast/JsVisitable.java
index bd68f477d90..7d1c1e736ee 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsVisitable.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsVisitable.java
@@ -12,7 +12,7 @@ public interface JsVisitable {
    * Causes this object to have the visitor visit itself and its children.
    * 
    * @param visitor the visitor that should traverse this node
-   * @param ctx the context of an existing traversal
+   * @param context the context of an existing traversal
    */
-  void traverse(JsVisitor visitor, JsContext ctx);
+  void traverse(JsVisitor visitor, JsContext context);
 }
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsVisitor.java b/src/com/google/dart/compiler/backend/js/ast/JsVisitor.java
index df5be84598f..814ae92385b 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsVisitor.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsVisitor.java
@@ -90,7 +90,7 @@ public class JsVisitor {
   };
 
   public final <T extends JsVisitable> T accept(T node) {
-    return this.doAccept(node);
+    return doAccept(node);
   }
 
   public final <T extends JsVisitable> void acceptList(List<T> collection) {
@@ -105,10 +105,6 @@ public class JsVisitor {
     doAcceptWithInsertRemove(collection);
   }
 
-  public boolean didChange() {
-    throw new UnsupportedOperationException();
-  }
-
   public void endVisit(JsArrayAccess x, JsContext ctx) {
   }
 
diff --git a/src/com/google/dart/compiler/backend/js/ast/JsWhile.java b/src/com/google/dart/compiler/backend/js/ast/JsWhile.java
index c3639154d0d..c00d355335d 100644
--- a/src/com/google/dart/compiler/backend/js/ast/JsWhile.java
+++ b/src/com/google/dart/compiler/backend/js/ast/JsWhile.java
@@ -36,12 +36,12 @@ public class JsWhile extends JsNodeImpl implements JsStatement {
     }
 
     @Override
-    public void traverse(JsVisitor v, JsContext ctx) {
-        if (v.visit(this, ctx)) {
+    public void traverse(JsVisitor v, JsContext context) {
+        if (v.visit(this, context)) {
             condition = v.accept(condition);
             body = v.accept(body);
         }
-        v.endVisit(this, ctx);
+        v.endVisit(this, context);
     }
 
     @Override