diff --git a/common/modules/javascript.jsm b/common/modules/javascript.jsm
index 259fa537..cf52093a 100644
--- a/common/modules/javascript.jsm
+++ b/common/modules/javascript.jsm
@@ -55,7 +55,8 @@ var JavaScript = Module("javascript", {
 
     lazyInit: true,
 
-    newContext: function () this.modules.newContext(this.modules.userContext, false, "Dactyl JS Temp Context"),
+    newContext: function () this.modules.newContext(this.modules.userContext, false,
+                                                    "Dactyl JS Temp Context"),
 
     completers: Class.Memoize(() => Object.create(JavaScript.completers)),
 
diff --git a/common/modules/main.jsm b/common/modules/main.jsm
index 795e18b6..cdcf9bd5 100644
--- a/common/modules/main.jsm
+++ b/common/modules/main.jsm
@@ -13,6 +13,8 @@ defineModule("main", {
 
 var BASE = "resource://dactyl-content/";
 
+var global = this;
+
 /**
  * @class ModuleBase
  * The base class for all modules.
@@ -99,16 +101,16 @@ var Modules = function Modules(window) {
 
         // Hack:
         // sandbox.Object = jsmodules.Object;
-        sandbox.File = jsmodules.File;
-        sandbox.Math = jsmodules.Math;
-        sandbox.Set = jsmodules.Set;
+        sandbox.File = global.File;
+        sandbox.Math = global.Math;
+        sandbox.Set  = global.Set;
         return sandbox;
     };
 
 
     const BASES = [BASE, "resource://dactyl-local-content/"];
 
-    jsmodules = newContext(window, false, "Dactyl `jsmodules`");
+    var jsmodules = newContext(window, false, "Dactyl `jsmodules`");
     jsmodules.NAME = "jsmodules";
 
     const create = bind("create", jsmodules.Object);