Index: ext/background.js
===================================================================
--- a/ext/background.js
+++ b/ext/background.js
@@ -12,17 +12,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
-(function()
 {
   let nonEmptyPageMaps = new Set();
 
   let PageMap = ext.PageMap = function()
   {
     this._map = new Map();
   };
   PageMap.prototype = {
@@ -676,9 +675,9 @@
     create(createData, callback)
     {
       browser.windows.create(createData, createdWindow =>
       {
         afterTabLoaded(callback)(createdWindow.tabs[0]);
       });
     }
   };
-}());
+}
Index: ext/common.js
===================================================================
--- a/ext/common.js
+++ b/ext/common.js
@@ -12,17 +12,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
-(function()
 {
   window.ext = {};
 
   let EventTarget = ext._EventTarget = function()
   {
     this._listeners = new Set();
   };
   EventTarget.prototype = {
@@ -44,9 +43,9 @@
       return results;
     }
   };
 
 
   /* Message passing */
 
   ext.onMessage = new ext._EventTarget();
-}());
+}
Index: ext/content.js
===================================================================
--- a/ext/content.js
+++ b/ext/content.js
@@ -10,17 +10,16 @@
 {
   // Listen for messages from the background page.
   browser.runtime.onMessage.addListener((message, sender, sendResponse) =>
   {
     return ext.onMessage._dispatch(message, {}, sendResponse).includes(true);
   });
 }
 
-(function()
 {
   let port = null;
 
   ext.onExtensionUnloaded = {
     addListener(listener)
     {
       if (!port)
         port = browser.runtime.connect();
@@ -38,9 +37,9 @@
         if (!port.onDisconnect.hasListeners())
         {
           port.disconnect();
           port = null;
         }
       }
     }
   };
-}());
+}
Index: ext/devtools.js
===================================================================
--- a/ext/devtools.js
+++ b/ext/devtools.js
@@ -12,16 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
-(function()
 {
   let inspectedTabId = browser.devtools.inspectedWindow.tabId;
   let port = browser.runtime.connect({name: "devtools-" + inspectedTabId});
 
   ext.onMessage = port.onMessage;
   ext.devtools = browser.devtools;
-}());
+}
Index: qunit/tests/cssEscaping.js
===================================================================
--- a/qunit/tests/cssEscaping.js
+++ b/qunit/tests/cssEscaping.js
@@ -1,11 +1,10 @@
 "use strict";
 
-(function()
 {
   const {Filter, ElemHideFilter} = require("filterClasses");
   const {escapeCSS, quoteCSS} = require("filterComposer");
 
   module("CSS escaping");
 
   test("CSS escaping", () =>
   {
@@ -94,9 +93,9 @@
       // Leading dashes must be escaped, when followed by certain characters.
       testEscape("-" + chr);
     }
 
     // Test some non-ASCII characters. However, those shouldn't
     // require escaping.
     testEscape("\uD83D\uDE3B\u2665\u00E4");
   });
-}());
+}
Index: qunit/tests/filterValidation.js
===================================================================
--- a/qunit/tests/filterValidation.js
+++ b/qunit/tests/filterValidation.js
@@ -1,11 +1,10 @@
 "use strict";
 
-(function()
 {
   const {parseFilter, parseFilters} = require("filterValidation");
   const {BlockingFilter,
          ElemHideFilter,
          CommentFilter} = require("filterClasses");
 
   module("Filter validation");
 
@@ -66,9 +65,9 @@
     equal(result.filters[0].text, "||example.com^", "1st filter text matches");
 
     ok(result.filters[1] instanceof ElemHideFilter, "2nd filter is elemhide");
     equal(result.filters[1].text, "###foobar", "2nd filter text matches");
 
     ok(result.filters[2] instanceof CommentFilter, "3rd filter is comment");
     equal(result.filters[2].text, "! foo bar", "3rd filter text matches");
   });
-}());
+}
Index: qunit/tests/prefs.js
===================================================================
--- a/qunit/tests/prefs.js
+++ b/qunit/tests/prefs.js
@@ -1,11 +1,10 @@
 "use strict";
 
-(function()
 {
   const {Prefs} = require("prefs");
 
   module("Preferences", {
     setup()
     {
       this._pbackup = Object.create(null);
       for (let pref in Prefs)
@@ -155,9 +154,9 @@
     delete Prefs.notificationdata.bar;
     Prefs.notificationdata = JSON.parse(JSON.stringify(Prefs.notificationdata));
     deepEqual(
       Prefs.notificationdata, {},
       "Prefs object returns the correct value after setting pref to " +
       "default value"
     );
   });
-}());
+}
Index: qunit/tests/url.js
===================================================================
--- a/qunit/tests/url.js
+++ b/qunit/tests/url.js
@@ -12,17 +12,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
-(function()
 {
   let {getDecodedHostname,
        extractHostFromFrame,
        stringifyURL,
        isThirdParty} = require("url");
 
   module("URL/host tools");
 
@@ -174,9 +173,9 @@
       "[::ffff:192.0.2.128]", "[::ffff:192.1.2.128]", true,
       "different IPv4-mapped IPv6 address is third-party"
     );
     testThirdParty("xn--f-1gaa.com", "f\u00f6\u00f6.com", false,
                    "same IDN isn't third-party");
     testThirdParty("example.com..", "example.com....", false,
                    "traling dots are ignored");
   });
-}());
+}
Index: qunit/tests/versionComparator.js
===================================================================
--- a/qunit/tests/versionComparator.js
+++ b/qunit/tests/versionComparator.js
@@ -14,17 +14,16 @@
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* globals Cu */
 
 "use strict";
 
-(function()
 {
   const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
   const {compare} = Services.vc;
 
   function allPairs(array)
   {
     let pairs = [];
     for (let i = 0; i < array.length - 1; i++)
@@ -108,9 +107,9 @@
       let v2 = [].concat(pair[1]);
       for (let i = 0; i < v1.length; i++)
       {
         for (let j = 0; j < v2.length; j++)
           versionSmaller(v1[i], v2[j]);
       }
     });
   });
-}());
+}