diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index 981a90cc..813ba849 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -826,7 +826,7 @@ function Bookmarks() //{{{
         }
     };
     //}}}
-}; //}}}
+} //}}}
 
 function History() //{{{
 {
@@ -1092,7 +1092,7 @@ function History() //{{{
         }
     };
     //}}}
-}; //}}}
+} //}}}
 
 function QuickMarks() //{{{
 {
@@ -1253,6 +1253,6 @@ function QuickMarks() //{{{
         }
     };
     //}}}
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/browser.js b/common/content/browser.js
index b8452b2e..7ea86402 100644
--- a/common/content/browser.js
+++ b/common/content/browser.js
@@ -295,6 +295,6 @@ function Browser() //{{{
         // TODO: extract browser-specific functionality from liberator
     };
     //}}}
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/buffer.js b/common/content/buffer.js
index d195d6eb..cc7f0b94 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -1619,7 +1619,7 @@ function Buffer() //{{{
         }
     };
     //}}}
-}; //}}}
+} //}}}
 
 /**
  * @instance marks
@@ -2012,6 +2012,6 @@ function Marks() //{{{
 
     };
     //}}}
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/commands.js b/common/content/commands.js
index 1ad66660..d7fcaa10 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -1263,6 +1263,6 @@ function Commands() //{{{
 
     return self;
 
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/completion.js b/common/content/completion.js
index df30adc9..30740f2b 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1419,6 +1419,6 @@ function Completion() //{{{
 
     return self;
     //}}}
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/editor.js b/common/content/editor.js
index e4b0f134..e69f8cda 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -1214,6 +1214,6 @@ function Editor() //{{{
         //}}}
     };
     //}}}
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/events.js b/common/content/events.js
index 5e835f8c..b01cfa92 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -338,7 +338,7 @@ function AutoCommands() //{{{
         }
     };
     //}}}
-}; //}}}
+} //}}}
 
 /**
  * @instance events
@@ -1835,6 +1835,6 @@ function Events() //{{{
 
     return self;
 
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/finder.js b/common/content/finder.js
index 4ab7ed86..754987f4 100644
--- a/common/content/finder.js
+++ b/common/content/finder.js
@@ -517,6 +517,6 @@ function Finder() //{{{
         }
     };
     //}}}
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/hints.js b/common/content/hints.js
index 72a09081..486dbaec 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -1099,6 +1099,6 @@ function Hints() //{{{
     // }
 
     //}}}
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/io.js b/common/content/io.js
index 369acbd4..1b59c639 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -1188,7 +1188,7 @@ lookup:
 
     return self;
 
-}; //}}}
+} //}}}
 
 IO.PATH_SEP = (function () {
     let f = services.get("directory").get("CurProcD", Ci.nsIFile);
diff --git a/common/content/mappings.js b/common/content/mappings.js
index f974303e..32bf284d 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -566,6 +566,6 @@ function Mappings() //{{{
         }
     };
     //}}}
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/options.js b/common/content/options.js
index 627a2902..d75b5447 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -1413,6 +1413,6 @@ function Options() //{{{
 
     return self;
 
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/services.js b/common/content/services.js
index 4c16b8dd..9d980146 100644
--- a/common/content/services.js
+++ b/common/content/services.js
@@ -117,7 +117,7 @@ function Services()
     self.addClass("process",    "@mozilla.org/process/util;1",          Ci.nsIProcess);
 
     return self;
-};
+}
 
 var services = Services();
 
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 18622a83..db2daad0 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -1176,6 +1176,6 @@ function Tabs() //{{{
         }
     };
     //}}}
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/ui.js b/common/content/ui.js
index 5ce63056..553461ea 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -1768,7 +1768,7 @@ function CommandLine() //{{{
 
     return self;
 
-}; //}}}
+} //}}}
 
 /**
  * The list which is used for the completion box (and QuickFix window in
@@ -2042,7 +2042,7 @@ function ItemList(id) //{{{
         onEvent: function onEvent(event) false
     };
     //}}}
-}; //}}}
+} //}}}
 
 function StatusLine() //{{{
 {
@@ -2326,6 +2326,6 @@ function StatusLine() //{{{
 
     };
     //}}}
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/muttator/content/addressbook.js b/muttator/content/addressbook.js
index 72eee604..8505f098 100644
--- a/muttator/content/addressbook.js
+++ b/muttator/content/addressbook.js
@@ -204,6 +204,6 @@ function Addressbook() //{{{
         }
     };
     //}}}
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/muttator/content/compose/compose.js b/muttator/content/compose/compose.js
index aab454fe..6dbe9fa7 100644
--- a/muttator/content/compose/compose.js
+++ b/muttator/content/compose/compose.js
@@ -126,6 +126,6 @@ function Compose() //{{{
     return {};
 
     //}}}
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/muttator/content/mail.js b/muttator/content/mail.js
index 7769ca06..54d89b87 100755
--- a/muttator/content/mail.js
+++ b/muttator/content/mail.js
@@ -1067,6 +1067,6 @@ function Mail() //{{{
         }
     };
     //}}}
-}; //}}}
+} //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et: