diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index c4e2da06..f7bd0f51 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -92,9 +92,9 @@ function Bookmarks() //{{{
         this.__defineGetter__("bookmarks", function () this.load());
 
         this.__defineGetter__("keywords",
-            function () [new Keyword(k.keyword, k.title, k.icon, k.url) for each (k in self.bookmarks) if (k.keyword)]);
+            function () [new Keyword(k.keyword, k.title, k.icon, k.url) for ([,k] in Iterator(self.bookmarks)) if (k.keyword)]);
 
-        this.__iterator__ = function () (val for each (val in self.bookmarks));
+        this.__iterator__ = function () (val for ([,val] in Iterator(self.bookmarks)));
 
         function loadBookmark(node)
         {
diff --git a/common/content/buffer.js b/common/content/buffer.js
index 23952302..f6d18faa 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -1945,7 +1945,7 @@ function Marks() //{{{
                   Math.round(mark[1].position.x * 100) + "%",
                   Math.round(mark[1].position.y * 100) + "%",
                   mark[1].location]
-                  for each (mark in marks)));
+                 for ([,mark] in Iterator(marks))));
             commandline.echo(list, commandline.HL_NORMAL, commandline.FORCE_MULTILINE);
         }
 
diff --git a/common/content/commands.js b/common/content/commands.js
index dcc7f4dc..5d7707b2 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -1091,7 +1091,7 @@ function Commands() //{{{
                           cmd.count ? "0c" : "",
                           completerToString(cmd.completer),
                           cmd.replacementText || "function () { ... }"]
-                         for each (cmd in cmds)));
+                         for ([,cmd] in Iterator(cmds))));
 
                     commandline.echo(str, commandline.HL_NORMAL, commandline.FORCE_MULTILINE);
                 }
diff --git a/common/content/hints.js b/common/content/hints.js
index a333b967..4095d721 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -164,7 +164,7 @@ function Hints() //{{{
             return [elem.value, false];
         else
         {
-            for each (let option in options["hintinputs"].split(","))
+            for (let [,option] in Iterator(options["hintinputs"].split(",")))
             {
                 if (option == "value")
                 {
diff --git a/common/content/liberator.js b/common/content/liberator.js
index 1efbd785..855004d4 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -1050,7 +1050,7 @@ const liberator = (function () //{{{
             }
 
             liberator.echomsg('Searching for "plugin/**/*.{js,vimp}" in "'
-                                + [dir.path.replace(/.plugin$/, "") for each (dir in dirs)].join(",") + '"', 2);
+                                + [dir.path.replace(/.plugin$/, "") for ([,dir] in Iterator(dirs))].join(",") + '"', 2);
 
             dirs.forEach(function (dir) {
                 liberator.echomsg("Searching for \"" + (dir.path + "/**/*.{js,vimp}") + "\"", 3);
diff --git a/common/content/style.js b/common/content/style.js
index 9be43eeb..0e260395 100644
--- a/common/content/style.js
+++ b/common/content/style.js
@@ -509,7 +509,7 @@ let (array = util.Array)
             catch (e) {}
             context.fork("others", 0, this, function (context) {
                 context.title = ["Site"];
-                context.completions = [[s, ""] for each (s in styles.sites)];
+                context.completions = [[s, ""] for ([,s] in Iterator(styles.sites))];
             });
         }
     });