diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index c4d0189e..981a90cc 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -1207,7 +1207,7 @@ function QuickMarks() //{{{
         {
             let pattern = RegExp("[" + filter.replace(/\s+/g, "") + "]");
 
-            for (let [qmark,] in qmarks)
+            for (let [qmark, ] in qmarks)
             {
                 if (pattern.test(qmark))
                     qmarks.remove(qmark);
diff --git a/common/content/buffer.js b/common/content/buffer.js
index 56186b3b..d195d6eb 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -1667,7 +1667,7 @@ function Marks() //{{{
         if (localmark)
         {
             let win = window.content;
-            for (let [i,] in Iterator(localmark))
+            for (let [i, ] in Iterator(localmark))
             {
                 if (localmark[i].location == win.location.href)
                 {
@@ -1903,17 +1903,17 @@ function Marks() //{{{
             if (special)
             {
                 // :delmarks! only deletes a-z marks
-                for (let [mark,] in localMarks)
+                for (let [mark, ] in localMarks)
                     removeLocalMark(mark);
             }
             else
             {
-                for (let [mark,] in urlMarks)
+                for (let [mark, ] in urlMarks)
                 {
                     if (filter.indexOf(mark) >= 0)
                         removeURLMark(mark);
                 }
-                for (let [mark,] in localMarks)
+                for (let [mark, ] in localMarks)
                 {
                     if (filter.indexOf(mark) >= 0)
                         removeLocalMark(mark);
diff --git a/common/content/completion.js b/common/content/completion.js
index b3459773..df30adc9 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -471,13 +471,13 @@ CompletionContext.prototype = {
         let filter = fixCase(this.filter);
         if (this.anchored)
         {
-            function compare (text, s) text.substr(0, s.length) == s;
+            function compare(text, s) text.substr(0, s.length) == s;
             substrings = util.map(util.range(filter.length, text.length + 1),
                 function (end) text.substring(0, end));
         }
         else
         {
-            function compare (text, s) text.indexOf(s) >= 0;
+            function compare(text, s) text.indexOf(s) >= 0;
             substrings = [];
             let start = 0;
             let idx;
diff --git a/common/content/events.js b/common/content/events.js
index 4dd6319f..d54023e3 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -842,7 +842,7 @@ function Events() //{{{
         {
             let re = RegExp(filter);
 
-            for (let [item,] in macros)
+            for (let [item, ] in macros)
             {
                 if (re.test(item) || !filter)
                     macros.remove(item);
diff --git a/common/content/hints.js b/common/content/hints.js
index d54fd9d4..b36b3b56 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -449,7 +449,7 @@ function Hints() //{{{
         {
             let css = [];
             // FIXME: Broken for imgspans.
-            for (let [,{ doc: doc }] in Iterator(docs))
+            for (let [, { doc: doc }] in Iterator(docs))
             {
                 for (let elem in buffer.evaluateXPath("//*[@liberator:highlight and @number]", doc))
                 {
@@ -560,7 +560,7 @@ function Hints() //{{{
      *
      * @param {Event} event The keypress event.
      */
-    function onInput (event)
+    function onInput(event)
     {
         prevInput = "text";
 
diff --git a/common/content/tabs.js b/common/content/tabs.js
index f1c31060..57137f03 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -1072,7 +1072,7 @@ function Tabs() //{{{
             let lowerBuffer = buffer.toLowerCase();
             let first = tabs.index() + (reverse ? 0 : 1);
             let nbrowsers = getBrowser().browsers.length;
-            for (let [i,] in tabs.browsers)
+            for (let [i, ] in tabs.browsers)
             {
                 let index = (i + first) % nbrowsers;
                 let url = getBrowser().getBrowserAtIndex(index).contentDocument.location.href;
diff --git a/common/content/ui.js b/common/content/ui.js
index b2104264..d2ff3f28 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -2085,7 +2085,8 @@ function StatusLine() //{{{
                     var value = aURI.spec;
                     // Try to decode as UTF-8 if there's no encoding sequence that we would break.
                     if (!/%25(?:3B|2F|3F|3A|40|26|3D|2B|24|2C|23)/i.test(value))
-                        try {
+                        try
+                        {
                             value = decodeURI(value)
                             // 1. decodeURI decodes %25 to %, which creates unintended
                             //    encoding sequences. Re-encode it, unless it's part of
@@ -2096,7 +2097,8 @@ function StatusLine() //{{{
                             //    by the location bar (bug 410726).
                             .replace(/%(?!3B|2F|3F|3A|40|26|3D|2B|24|2C|23)|[\r\n\t]/ig,
                                 encodeURIComponent);
-                        } catch (e) {}
+                        }
+                        catch (e) {}
 
                     // Encode invisible characters (soft hyphen, zero-width space, BOM,
                     // line and paragraph separator, word joiner, invisible times,
diff --git a/vimperator/regressions.js b/vimperator/regressions.js
index a1040bd6..c173aa3d 100644
--- a/vimperator/regressions.js
+++ b/vimperator/regressions.js
@@ -150,7 +150,7 @@ commands.addUserCommand(["regr[essions]"],
             commandline.updateOutputHeight = updateOutputHeight;
         }
 
-        function run ()
+        function run()
         {
             let now = Date.now();
             let totalTests = tests.length + functions.length;
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index f231ee9a..2697fe07 100644
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -609,7 +609,7 @@ function Player() // {{{
             return tracksList;
         },
 
-        searchView: function searchView (args)
+        searchView: function searchView(args)
         {
             let currentView = _SBGetCurrentView();
             let mediaItemList = currentView.mediaList;