Kill :dia import.

common/modules/bookmarkcache.jsm

@@ -7,9 +7,11 @@
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("bookmarkcache", {
     exports: ["Bookmark", "BookmarkCache", "Keyword", "bookmarkcache"],
-    require: ["services", "storage", "util"]
+    require: ["services", "util"]
 }, this);
 
+this.lazyRequire("storage", ["storage"]);
+
 function newURI(url, charset, base) {
     try {
         return services.io.newURI(url, charset, base);

common/modules/config.jsm

@@ -10,7 +10,7 @@ let global = this;
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("config", {
     exports: ["ConfigBase", "Config", "config"],
-    require: ["dom", "protocol", "services", "storage", "util", "template"]
+    require: ["dom", "io", "protocol", "services", "util", "template"]
 }, this);
 
 this.lazyRequire("addons", ["AddonManager"]);
@@ -18,6 +18,7 @@ this.lazyRequire("cache", ["cache"]);
 this.lazyRequire("highlight", ["highlight"]);
 this.lazyRequire("messages", ["_"]);
 this.lazyRequire("prefs", ["localPrefs", "prefs"]);
+this.lazyRequire("storage", ["storage", "File"]);
 
 function AboutHandler() {}
 AboutHandler.prototype = {

common/modules/help.jsm

@@ -7,7 +7,7 @@
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("help", {
     exports: ["help"],
-    require: ["cache", "dom", "javascript", "protocol", "services", "util"]
+    require: ["cache", "dom", "protocol", "services", "util"]
 }, this);
 
 this.lazyRequire("completion", ["completion"]);
@@ -290,7 +290,7 @@ var Help = Module("Help", {
             dactyl.open("dactyl://help/" + page, { from: "help" });
         },
 
-        exportHelp: JavaScript.setCompleter(function (path) {
+        exportHelp: function (path) {
             const FILE = io.File(path);
             const PATH = FILE.leafName.replace(/\..*/, "") + "/";
             const TIME = Date.now();
@@ -401,7 +401,7 @@ var Help = Module("Help", {
 
             if (zip)
                 zip.close();
-        }, [function (context, args) overlay.activeModules.completion.file(context)]),
+        }
 
     })
 }, {
@@ -455,6 +455,10 @@ var Help = Module("Help", {
         mappings.add([modes.MAIN], ["<open-single-help>", "<A-F1>"],
             "Open the single, consolidated help page",
             function () { modules.ex.helpall(); });
+    },
+    javascript: function init_javascript(dactyl, modules, window) {
+        modules.JavaScript.setCompleter([this.exportHelp],
+            [function (context, args) overlay.activeModules.completion.file(context)]);
     }
 });
 

common/modules/highlight.jsm

@@ -7,9 +7,11 @@
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("highlight", {
     exports: ["Highlight", "Highlights", "highlight"],
-    require: ["services", "styles", "util"]
+    require: ["services", "util"]
 }, this);
 
+this.lazyRequire("styles", ["Styles", "styles"]);
+
 var Highlight = Struct("class", "selector", "sites",
                        "defaultExtends", "defaultValue",
                        "value", "extends", "agent",

common/modules/io.jsm

@@ -28,7 +28,7 @@ var IO = Module("io", {
         this._processDir = services.directory.get("CurWorkD", Ci.nsIFile);
         this._cwd = this._processDir.path;
         this._oldcwd = null;
-        this.config = config;
+        lazyRequire("config", ["config"], this);
     },
 
     Local: function Local(dactyl, modules, window) let ({ io, plugins } = modules) ({

common/modules/main.jsm

@@ -9,7 +9,7 @@ try {
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("main", {
     exports: ["ModuleBase"],
-    require: ["config", "help", "highlight", "io", "overlay", "services", "util"]
+    require: ["config", "overlay", "services", "util"]
 }, this);
 
 var BASE = "resource://dactyl-content/";

common/modules/sanitizer.jsm

@@ -15,10 +15,12 @@
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("sanitizer", {
     exports: ["Range", "Sanitizer", "sanitizer"],
-    require: ["config", "prefs", "services", "storage", "template", "util"]
+    require: ["config", "prefs", "services", "util"]
 }, this);
 
 this.lazyRequire("messages", ["_"]);
+this.lazyRequire("storage", ["storage"]);
+this.lazyRequire("template", ["teplate"]);
 
 let tmp = {};
 JSMLoader.loadSubScript("chrome://browser/content/sanitize.js", tmp);