After some profiling, give all modules a common prototype.

common/modules/addons.jsm

@@ -10,8 +10,7 @@ try {
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("addons", {
     exports: ["AddonManager", "Addons", "Addon", "addons"],
-    require: ["services"],
+    require: ["services"]
-    use: ["completion", "config", "io", "messages", "prefs", "template", "util"]
 }, this);
 
 var callResult = function callResult(method) {

common/modules/base.jsm

@@ -122,6 +122,7 @@ if (!Object.keys)
 
 let getGlobalForObject = Cu.getGlobalForObject || function (obj) obj.__parent__;
 
+let jsmodules = {};
 let use = {};
 let loaded = {};
 let currentModule;
@@ -132,18 +133,15 @@ function defineModule(name, params, module) {
 
     module.NAME = name;
     module.EXPORTED_SYMBOLS = params.exports || [];
+    delete module.File;
+
     defineModule.loadLog.push("[Begin " + name + "]");
     defineModule.prefix += "  ";
-    for (let [, mod] in Iterator(params.require || []))
-        require(module, mod);
 
-    for (let [, mod] in Iterator(params.use || []))
+    for (let [, mod] in Iterator(params.require || []))
-        if (loaded.hasOwnProperty(mod))
+        require(jsmodules, mod, null, name);
-            require(module, mod, "use");
+    module.__proto__ = jsmodules;
-        else {
+
-            use[mod] = use[mod] || [];
-            use[mod].push(module);
-        }
     module._lastModule = currentModule;
     currentModule = module;
     module.startTime = Date.now();
@@ -189,14 +187,12 @@ function endModule() {
     defineModule.prefix = defineModule.prefix.slice(0, -2);
     defineModule.loadLog.push("(End   " + currentModule.NAME + ")");
 
-    for (let [, mod] in Iterator(use[currentModule.NAME] || []))
-        require(mod, currentModule.NAME, "use");
-
     loaded[currentModule.NAME] = 1;
+    require(jsmodules, currentModule.NAME);
     currentModule = currentModule._lastModule;
 }
 
-function require(obj, name, from) {
+function require(obj, name, from, targetName) {
     try {
         if (arguments.length === 1)
             [obj, name] = [{}, obj];
@@ -204,7 +200,8 @@ function require(obj, name, from) {
         let caller = Components.stack.caller;
 
         if (!loaded[name])
-            defineModule.loadLog.push((from || "require") + ": loading " + name + " into " + (obj.NAME || caller.filename + ":" + caller.lineNumber));
+            defineModule.loadLog.push((from || "require") + ": loading " + name +
+                                      " into " + (targetName || obj.NAME || caller.filename + ":" + caller.lineNumber));
 
         JSMLoader.load(name + ".jsm", obj);
         return obj;
@@ -228,8 +225,7 @@ defineModule("base", {
         "isGenerator", "isinstance", "isObject", "isString", "isSubclass", "iter", "iterAll",
         "iterOwnProperties", "keys", "memoize", "octal", "properties", "require", "set", "update",
         "values", "withCallerGlobal"
-    ],
+    ]
-    use: ["config", "services", "util"]
 }, this);
 
 function Runnable(self, func, args) {

common/modules/commands.jsm

@@ -11,8 +11,7 @@ try {
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("commands", {
     exports: ["ArgType", "Command", "Commands", "CommandOption", "Ex", "commands"],
-    require: ["contexts", "messages", "util"],
+    require: ["contexts", "messages", "util"]
-    use: ["config", "help", "options", "services", "template"]
 }, this);
 
 /**

common/modules/completion.jsm

@@ -10,8 +10,7 @@ try {
 
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("completion", {
-    exports: ["CompletionContext", "Completion", "completion"],
+    exports: ["CompletionContext", "Completion", "completion"]
-    use: ["config", "messages", "template", "util"]
 }, this);
 
 /**

common/modules/config.jsm

@@ -10,8 +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", "protocol", "services", "storage", "util", "template"]
-    use: ["io", "messages", "prefs", "styles"]
 }, this);
 
 function AboutHandler() {}

common/modules/contexts.jsm

@@ -8,8 +8,7 @@ try {
 
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("contexts", {
-    exports: ["Contexts", "Group", "contexts"],
+    exports: ["Contexts", "Group", "contexts"]
-    use: ["commands", "messages", "options", "services", "storage", "styles", "template", "util"]
 }, this);
 
 var Const = function Const(val) Class.Property({ enumerable: true, value: val });

common/modules/dom.jsm

@@ -7,8 +7,7 @@
 
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("dom", {
-    exports: ["$", "DOM", "NS", "XBL", "XHTML", "XUL"],
+    exports: ["$", "DOM", "NS", "XBL", "XHTML", "XUL"]
-    use: ["config", "highlight", "template", "util"],
 }, this);
 
 var XBL = Namespace("xbl", "http://www.mozilla.org/xbl");

common/modules/downloads.jsm

@@ -6,8 +6,7 @@
 
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("downloads", {
-    exports: ["Download", "Downloads", "downloads"],
+    exports: ["Download", "Downloads", "downloads"]
-    use: ["io", "messages", "prefs", "services", "util"]
 }, this);
 
 Cu.import("resource://gre/modules/DownloadUtils.jsm", this);

common/modules/finder.jsm

@@ -7,8 +7,7 @@
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("finder", {
     exports: ["RangeFind", "RangeFinder", "rangefinder"],
-    require: ["prefs"],
+    require: ["prefs"]
-    use: ["dom", "messages", "services", "util"]
 }, this);
 
 function equals(a, b) XPCNativeWrapper(a) == XPCNativeWrapper(b);

common/modules/help.jsm

@@ -7,8 +7,7 @@
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("help", {
     exports: ["help"],
-    require: ["dom", "protocol", "services", "util"],
+    require: ["dom", "protocol", "services", "util"]
-    use: ["config", "highlight", "messages", "template"]
 }, this);
 
 var Help = Module("Help", {

common/modules/highlight.jsm

@@ -7,8 +7,7 @@
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("highlight", {
     exports: ["Highlight", "Highlights", "highlight"],
-    require: ["services", "styles", "util"],
+    require: ["services", "styles", "util"]
-    use: ["messages", "template"]
 }, this);
 
 var Highlight = Struct("class", "selector", "sites",

common/modules/io.jsm

@@ -12,8 +12,7 @@ try {
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("io", {
     exports: ["IO", "io"],
-    require: ["services"],
+    require: ["services"]
-    use: ["config", "help", "messages", "storage", "styles", "template", "util"]
 }, this);
 
 // TODO: why are we passing around strings rather than file objects?

common/modules/javascript.jsm

@@ -10,8 +10,7 @@ try {
 
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("javascript", {
-    exports: ["JavaScript", "javascript"],
+    exports: ["JavaScript", "javascript"]
-    use: ["messages", "services", "template", "util"]
 }, this);
 
 let isPrototypeOf = Object.prototype.isPrototypeOf;

common/modules/options.jsm

@@ -11,8 +11,7 @@ try {
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("options", {
     exports: ["Option", "Options", "ValueError", "options"],
-    require: ["contexts", "messages", "storage"],
+    require: ["contexts", "messages", "storage"]
-    use: ["commands", "completion", "config", "prefs", "services", "styles", "template", "util"]
 }, this);
 
 /** @scope modules */

common/modules/prefs.jsm

@@ -11,8 +11,7 @@ try {
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("prefs", {
     exports: ["Prefs", "localPrefs", "prefs"],
-    require: ["services", "util"],
+    require: ["services", "util"]
-    use: ["config", "messages", "template"]
 }, this);
 
 var Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]), {

common/modules/sanitizer.jsm

@@ -17,7 +17,6 @@ try {
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("sanitizer", {
     exports: ["Range", "Sanitizer", "sanitizer"],
-    use: ["config"],
     require: ["messages", "prefs", "services", "storage", "template", "util"]
 }, this);
 

common/modules/services.jsm

@@ -9,8 +9,7 @@ try {
 var global = this;
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("services", {
-    exports: ["services"],
+    exports: ["services"]
-    use: ["util"]
 }, this);
 
 /**

common/modules/storage.jsm

@@ -293,7 +293,7 @@ var Storage = Module("Storage", {
  * @param {boolean} checkPWD Whether to allow expansion relative to the
  *          current directory. @default true
  */
-var File = Class("File", {
+this.File = Class("File", {
     init: function (path, checkPWD) {
         let file = services.File();
 
@@ -621,6 +621,6 @@ var File = Class("File", {
 
 endModule();
 
-// catch(e){dump(e.fileName+":"+e.lineNumber+": "+e+"\n" + e.stack);}
+// catch(e){ dump(e + "\n" + (e.stack || Error().stack)); Components.utils.reportError(e) }
 
 // vim: set fdm=marker sw=4 sts=4 et ft=javascript:

common/modules/styles.jsm

@@ -7,8 +7,7 @@
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("styles", {
     exports: ["Style", "Styles", "styles"],
-    require: ["services", "util"],
+    require: ["services", "util"]
-    use: ["contexts", "dom", "messages", "template"]
 }, this);
 
 function cssUri(css) "chrome-data:text/css," + encodeURI(css);

common/modules/template.jsm

@@ -7,8 +7,7 @@
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("template", {
     exports: ["Binding", "Template", "template"],
-    require: ["util"],
+    require: ["util"]
-    use: ["help", "messages", "services"]
 }, this);
 
 default xml namespace = XHTML;

common/modules/util.jsm

@@ -8,11 +8,11 @@
 
 try {
 
+    let global=this;
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("util", {
     exports: ["DOM", "$", "FailedAssertion", "Math", "NS", "Point", "Util", "XBL", "XHTML", "XUL", "util"],
-    require: ["dom", "services"],
+    require: ["dom", "services"]
-    use: ["commands", "config", "highlight", "messages", "overlay", "storage", "template"]
 }, this);
 
 var FailedAssertion = Class("FailedAssertion", ErrorBase, {