diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 986d93e7..11b9e6a1 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -807,7 +807,6 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
                 '\n</overlay>'];
 
             addTags("index", util.httpGet("dactyl://help-overlay/index").responseXML);
-            addTags("index", util.httpGet("dactyl://help/index").responseXML);
 
             this.helpInitialized = true;
         }
diff --git a/common/modules/finder.jsm b/common/modules/finder.jsm
index 4d1c00e0..a6c84165 100644
--- a/common/modules/finder.jsm
+++ b/common/modules/finder.jsm
@@ -167,8 +167,9 @@ var RangeFinder = Module("rangefinder", {
 }, {
 }, {
     modes: function initModes(dactyl, modules, window) {
+        initModes.require("commandline");
+
         const { modes } = modules;
-        initModes.superapply("commandline", arguments);
 
         modes.addMode("FIND", {
             description: "Find mode, active when typing search input",
diff --git a/common/modules/overlay.jsm b/common/modules/overlay.jsm
index 9a0580c5..4428690f 100644
--- a/common/modules/overlay.jsm
+++ b/common/modules/overlay.jsm
@@ -246,8 +246,7 @@ var Overlay = Module("Overlay", {
                         callee.frobbed = true;
                     };
 
-                    if (name !== "init" && name !== "load")
-                        INIT[name].superapply = function (name) { init[name](); };
+                    INIT[name].require = function (name) { init[name](); };
                 }
 
                 function frobModules() {