diff --git a/js/rhino/org/mozilla/javascript/Interpreter.java b/js/rhino/org/mozilla/javascript/Interpreter.java
index 9ab7a15c17a0..17ac1928fc62 100644
--- a/js/rhino/org/mozilla/javascript/Interpreter.java
+++ b/js/rhino/org/mozilla/javascript/Interpreter.java
@@ -1270,7 +1270,7 @@ public class Interpreter extends LabelTable {
                                     " " + count + " \"" + 
                                     getString(theData.itsStringTable, iCode, 
                                               pc + 1) + "\"");
-                                pc += 4;
+                                pc += 5;
                             }
                             break;
                         case TokenStream.NUMBER :
diff --git a/js/rhino/org/mozilla/javascript/Node.java b/js/rhino/org/mozilla/javascript/Node.java
index 4d1bce808bc2..765633c997da 100644
--- a/js/rhino/org/mozilla/javascript/Node.java
+++ b/js/rhino/org/mozilla/javascript/Node.java
@@ -303,7 +303,6 @@ public class Node implements Cloneable {
                 "vars",
                 "uses",
                 "regexp",
-                "switches",
                 "cases",
                 "default",
                 "casearray",
diff --git a/js/rhino/src/org/mozilla/javascript/Interpreter.java b/js/rhino/src/org/mozilla/javascript/Interpreter.java
index 9ab7a15c17a0..17ac1928fc62 100644
--- a/js/rhino/src/org/mozilla/javascript/Interpreter.java
+++ b/js/rhino/src/org/mozilla/javascript/Interpreter.java
@@ -1270,7 +1270,7 @@ public class Interpreter extends LabelTable {
                                     " " + count + " \"" + 
                                     getString(theData.itsStringTable, iCode, 
                                               pc + 1) + "\"");
-                                pc += 4;
+                                pc += 5;
                             }
                             break;
                         case TokenStream.NUMBER :
diff --git a/js/rhino/src/org/mozilla/javascript/Node.java b/js/rhino/src/org/mozilla/javascript/Node.java
index 4d1bce808bc2..765633c997da 100644
--- a/js/rhino/src/org/mozilla/javascript/Node.java
+++ b/js/rhino/src/org/mozilla/javascript/Node.java
@@ -303,7 +303,6 @@ public class Node implements Cloneable {
                 "vars",
                 "uses",
                 "regexp",
-                "switches",
                 "cases",
                 "default",
                 "casearray",