diff --git a/js/js.translator/lib/dart-ast.jar b/js/js.translator/lib/dart-ast.jar
index 6438d319773..5d4ca629ddb 100644
Binary files a/js/js.translator/lib/dart-ast.jar and b/js/js.translator/lib/dart-ast.jar differ
diff --git a/js/js.translator/lib/src/dart-ast-src.jar b/js/js.translator/lib/src/dart-ast-src.jar
index 489dea545b4..19865ea5944 100644
Binary files a/js/js.translator/lib/src/dart-ast-src.jar and b/js/js.translator/lib/src/dart-ast-src.jar differ
diff --git a/js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java b/js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java
index 023414ed69d..493e938b8c0 100644
--- a/js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java
+++ b/js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java
@@ -34,20 +34,13 @@ public class JsSourceGenerationVisitor extends JsToStringGenerationVisitor imple
     }
 
     @Override
-    public boolean visit(JsProgram program, JsContext ctx) {
-        return true;
+    public void visitProgramFragment(JsProgramFragment x, JsContext context) {
+        x.acceptChildren(this, context);
     }
 
     @Override
-    public boolean visit(JsProgramFragment x, JsContext ctx) {
-        // Descend naturally.
-        return true;
-    }
-
-    @Override
-    public boolean visit(JsBlock x, JsContext ctx) {
+    public void visitBlock(JsBlock x, JsContext ctx) {
         printJsBlock(x, false, true);
-        return false;
     }
 
     @Override
@@ -67,7 +60,7 @@ public class JsSourceGenerationVisitor extends JsToStringGenerationVisitor imple
     }
 
     @Override
-    protected void doTraverse(JsVisitable node, JsContext context) {
+    protected void doAccept(JsNode node, JsContext context) {
         if (sourceMapBuilder != null) {
             Object sourceInfo = node.getSourceInfo();
             if (sourceInfo != null) {
@@ -80,12 +73,12 @@ public class JsSourceGenerationVisitor extends JsToStringGenerationVisitor imple
                 }
             }
         }
-        super.doTraverse(node, context);
+        super.doAccept(node, context);
     }
 
     @Override
-    public void endVisit(JsProgram x, JsContext context) {
-        super.endVisit(x, context);
+    public void visitProgram(JsProgram program, JsContext context) {
+        program.acceptChildren(this, context);
         if (sourceMapBuilder != null) {
             sourceMapBuilder.addLink();
         }
diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java b/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
index 83511204a89..2de524bfafc 100644
--- a/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
+++ b/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
@@ -100,7 +100,7 @@ public final class K2JSTranslator {
     ) throws TranslationException {
         JsProgram program = generateProgram(files, mainCallParameters);
         JsSourceGenerationVisitor sourceGenerator = new JsSourceGenerationVisitor(output, sourceMapBuilder);
-        program.traverse(sourceGenerator, null);
+        program.accept(sourceGenerator, null);
         return output.toString();
     }
 
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
index c53c6928bf1..d0e1c7b915e 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
@@ -140,7 +140,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
         if (expressionInside != null) {
             return expressionInside.accept(this, context);
         }
-        return context.program().getEmptyStmt();
+        return context.program().getEmptyStatement();
     }
 
     @Override
@@ -214,7 +214,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
     private JsStatement translateNullableExpressionAsNotNullStatement(@Nullable JetExpression nullableExpression,
             @NotNull TranslationContext context) {
         if (nullableExpression == null) {
-            return context.program().getEmptyStmt();
+            return context.program().getEmptyStatement();
         }
         return convertToStatement(nullableExpression.accept(this, context));
     }
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/TryTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/TryTranslator.java
index 31271315769..1553c061284 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/TryTranslator.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/expression/TryTranslator.java
@@ -89,7 +89,7 @@ public final class TryTranslator extends AbstractTranslator {
     private JsBlock translateCatchBody(@NotNull JetCatchClause catchClause) {
         JetExpression catchBody = catchClause.getCatchBody();
         if (catchBody == null) {
-            return convertToBlock(program().getEmptyStmt());
+            return convertToBlock(program().getEmptyStatement());
         }
         return convertToBlock(Translation.translateAsStatement(catchBody, context()));
     }
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/InlinedCallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/InlinedCallExpressionTranslator.java
index eeddeeae03f..bb90d730f6b 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/InlinedCallExpressionTranslator.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/reference/InlinedCallExpressionTranslator.java
@@ -177,7 +177,7 @@ public final class InlinedCallExpressionTranslator extends AbstractCallExpressio
         @Override
         public JsNode mutate(@NotNull JsNode node) {
             if (node instanceof JsReturn) {
-                JsExpression returnedExpression = ((JsReturn)node).getExpr();
+                JsExpression returnedExpression = ((JsReturn)node).getExpression();
                 return JsAstUtils.assignment(toAssignTo.name().makeRef(), returnedExpression);
             }
             return node;