diff --git a/content/buffer.js b/content/buffer.js
index 291a5b5d..158a1413 100644
--- a/content/buffer.js
+++ b/content/buffer.js
@@ -1216,10 +1216,7 @@ liberator.Buffer = function () //{{{
                 var rel = link.rel && link.rel.toLowerCase();
                 var rels = {};
                 if (rel)
-                {
-                    for each (let relVal in rel.split(/\s+/))
-                        rels[relVal] = true;
-                }
+                    rels[rel] = true;
 
                 if (rels.feed || (link.type && rels.alternate && !rels.stylesheet))
                 {
@@ -1234,7 +1231,7 @@ liberator.Buffer = function () //{{{
 
             var lastModVerbose = new Date(window.content.document.lastModified).toLocaleString();
             var lastMod = new Date(window.content.document.lastModified).toLocaleFormat("%x %X");
-            // FIXME: probably unportable across different language versions
+            // FIXME: probably not portable across different language versions
             if (lastModVerbose == "Invalid Date" || new Date(window.content.document.lastModified).getFullYear() == 1970)
                 lastModVerbose = lastMod = null;
 
diff --git a/content/completion.js b/content/completion.js
index 162fb773..fae5d5d7 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -341,8 +341,8 @@ liberator.Completion = function () //{{{
         macro: function (filter)
         {
             var macros = [];
-            var tmp = liberator.events.getMacros();
-            for (var item in tmp)
+
+            for (var item in liberator.events.getMacros())
                 macros.push([item, tmp[item]]);
 
             return [0, liberator.completion.filter(macros, filter)];
diff --git a/content/events.js b/content/events.js
index 2290b12b..208b7b6c 100644
--- a/content/events.js
+++ b/content/events.js
@@ -394,16 +394,18 @@ liberator.Events = function () //{{{
     function getKeyCode(str)
     {
         str = str.toLowerCase();
-        for (var i in keyTable)
+
+        for (let i = 0; i < keyTable.length; i++)
         {
-            for (var k in keyTable[i][1])
+            for (let j = 0; j < keyTable[i][1].length; j++)
             {
                 // we don't store lowercase keys in the keyTable, because we
                 // also need to get good looking strings for the reverse action
-                if (keyTable[i][1][k].toLowerCase() == str)
+                if (keyTable[i][1][j].toLowerCase() == str)
                     return keyTable[i][0];
             }
         }
+
         return 0;
     }
 
@@ -881,7 +883,7 @@ liberator.Events = function () //{{{
                     if (event.shiftKey)
                         modifier += "S-";
 
-                    for (var i in keyTable)
+                    for (let i = 0; i < keyTable.length; i++)
                     {
                         if (keyTable[i][0] == event.keyCode)
                         {
diff --git a/content/mail.js b/content/mail.js
index 626f1105..fa855424 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -93,7 +93,8 @@ liberator.Mail = function () //{{{
     {
         var completions = [];
         var folders = liberator.mail.getFolders();
-        for (var folder in folders)
+
+        for (let folder = 0; folder < folders.length; folder++)
         {
             completions.push([folders[folder].server.prettyName + ": "
                               + folders[folder].name,
diff --git a/content/ui.js b/content/ui.js
index bb6be905..7f1099ca 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -1178,7 +1178,7 @@ liberator.InformationList = function (id, options) //{{{
 
         if (!incrementalFill)
         {
-            for (i in completions)
+            for (let i = 0; i < completions.length; i++)
                 addItem(completions[i], false);
             return complength;
         }
@@ -1197,7 +1197,7 @@ liberator.InformationList = function (id, options) //{{{
             addItem(completions[i], false);
         }
 
-        return (i-startindex);
+        return (i - startindex);
     }
 
     /////////////////////////////////////////////////////////////////////////////}}}