    }
  
    /**
-@@ -182,9 +187,8 @@ class SyntacticScopeCreator implements ScopeCreator {
+@@ -182,8 +186,8 @@ class SyntacticScopeCreator implements ScopeCreator {
     */
    private class DefaultRedeclarationHandler implements RedeclarationHandler {
      public void onRedeclaration(
 -        Scope s, String name, Node n, CompilerInput input) {
 -      Node parent = n.getParent();
--
 +        Scope s, String name,
 +        Node n, Node parent, Node gramps, Node nodeWithLineNumber) {
+ 
        // Don't allow multiple variables to be declared at the top level scope
        if (scope.isGlobal()) {
-         Scope.Var origVar = scope.getVar(name);
-@@ -228,17 +232,15 @@ class SyntacticScopeCreator implements ScopeCreator {
+@@ -228,17 +232,16 @@ class SyntacticScopeCreator implements ScopeCreator {
     * @param n The node corresponding to the variable name.
     * @param declaredType The variable's type, according to JSDoc
     */
 -  private void declareVar(Node n) {
 -    Preconditions.checkState(n.getType() == Token.NAME);
--
--    CompilerInput input = compiler.getInput(sourceName);
--    String name = n.getString();
 +  private void declareVar(String name, Node n, Node parent,
 +                          Node gramps, JSType declaredType,
 +                          Node nodeWithLineNumber) {
+ 
+-    CompilerInput input = compiler.getInput(sourceName);
+-    String name = n.getString();
      if (scope.isDeclared(name, false)
          || (scope.isLocal() && name.equals(ARGUMENTS))) {
        redeclarationHandler.onRedeclaration(

         scanVars(block, n);
         return;  // only one child to scan
 
@@ -174,7 +178,8 @@ class SyntacticScopeCreator implements ScopeCreator {
    */
   interface RedeclarationHandler {
     void onRedeclaration(

     }
 
diff --git a/src/com/google/javascript/jscomp/SyntacticScopeCreator.java b/src/com/google/javascript/jscomp/SyntacticScopeCreator.java
index eb6e1eab..04bafcf0 100644
--- a/src/com/google/javascript/jscomp/SyntacticScopeCreator.java
+++ b/src/com/google/javascript/jscomp/SyntacticScopeCreator.java
@@ -20,6 +20,7 @@ import com.google.common.base.Preconditions;
