diff --git a/common/content/abbreviations.js b/common/content/abbreviations.js
index 50117628..f81b35a3 100644
--- a/common/content/abbreviations.js
+++ b/common/content/abbreviations.js
@@ -264,7 +264,7 @@ var Abbreviations = Module("abbreviations", {
      * @optional
      */
     list: function (modes, lhs, hives) {
-        let hives = (hives || this.userHives).filter(h => !h.empty);
+        hives = (hives || this.userHives).filter(h => !h.empty);
 
         function abbrevs(hive)
             hive.merged.filter(ab => (ab.inModes(modes) && ab.lhs.startsWith(lhs)));
diff --git a/common/content/autocommands.js b/common/content/autocommands.js
index 7bb23472..37175aca 100644
--- a/common/content/autocommands.js
+++ b/common/content/autocommands.js
@@ -91,8 +91,7 @@ var AutoCommands = Module("autocommands", {
      * @optional
      */
     list: function (event, regexp, hives) {
-
-        let hives = hives || this.activeHives;
+        hives = hives || this.activeHives;
 
         function cmds(hive) {
             let cmds = {};
diff --git a/common/content/commandline.js b/common/content/commandline.js
index 9e66e533..9cc34a02 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -1481,6 +1481,9 @@ var CommandLine = Module("commandline", {
                 if (cmd.substr(cmd.length - str.length) == str)
                     commandline.widgets.active.command.value = cmd.substr(0, cmd.length - str.length);
             }
+            let e = this.editor.selection.focusNode;
+            if (e != this.editor.rootElement && e.parentNode != this.editor.rootElement)
+                this.editor.selection.getRangeAt(0).selectNodeContents(this.editor.rootElement);
             delete this.removeSubstring;
         },
 
diff --git a/common/content/editor.js b/common/content/editor.js
index 38153e48..0bad993c 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -369,7 +369,7 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), {
             args = { file: args };
         args.file = args.file.path || args.file;
 
-        let args = options.get("editor").format(args);
+        args = options.get("editor").format(args);
 
         dactyl.assert(args.length >= 1, _("option.notSet", "editor"));
 
@@ -1153,7 +1153,7 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), {
             ["<C-]>", "<C-5>"], "Expand Insert mode abbreviation",
             function () { editor.expandAbbreviation(modes.INSERT); });
 
-        let bind = function bind(names, description, action, params)
+        bind = function bind(names, description, action, params)
             mappings.add([modes.TEXT_EDIT], names, description,
                          action, update({ type: "editor" }, params));
 
@@ -1266,7 +1266,7 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), {
             },
             { arg: true });
 
-        let bind = function bind(names, description, action, params)
+        bind = function bind(names, description, action, params)
             mappings.add([modes.TEXT_EDIT, modes.OPERATOR, modes.VISUAL],
                          names, description,
                          action, update({ type: "editor" }, params));
@@ -1333,7 +1333,7 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), {
             },
             { count: true });
 
-        let bind = function bind(...args) mappings.add.apply(mappings, [[modes.AUTOCOMPLETE]].concat(args));
+        bind = function bind(...args) mappings.add.apply(mappings, [[modes.AUTOCOMPLETE]].concat(args));
 
         bind(["<Esc>"], "Return to Insert mode",
              () => Events.PASS_THROUGH);
diff --git a/common/content/hints.js b/common/content/hints.js
index 558ba84b..b51a2ffa 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -1278,7 +1278,7 @@ var Hints = Module("hints", {
             function ({ count }) { hints.open("g;", { continue: true, count: count }); },
             { count: true });
 
-        let bind = function bind(names, description, action, params)
+        bind = function bind(names, description, action, params)
             mappings.add([modes.HINTS], names, description,
                          action, params);
 
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 7d34390b..96d4f083 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -591,7 +591,7 @@ function curry(fn, length, self, acc) {
         if (args.length == 0)
             return close(self || this, curried);
 
-        let args = acc.concat(args);
+        args = acc.concat(args);
 
         if (args.length >= length)
             return fn.apply(self || this, args);
diff --git a/common/modules/buffer.jsm b/common/modules/buffer.jsm
index e9c3ead6..fe263d31 100644
--- a/common/modules/buffer.jsm
+++ b/common/modules/buffer.jsm
@@ -540,7 +540,7 @@ var Buffer = Module("Buffer", {
         let { dactyl } = this.modules;
 
         let doc = elem.ownerDocument;
-        let win = doc.defaultView;
+        win = doc.defaultView;
         let { left: offsetX, top: offsetY } = elem.getBoundingClientRect();
 
         if (isinstance(elem, [Ci.nsIDOMHTMLFrameElement,
@@ -560,8 +560,6 @@ var Buffer = Module("Buffer", {
             return;
         }
 
-        let { dactyl } = this.modules;
-
         let ctrlKey = false, shiftKey = false;
         let button = 0;
         switch (dactyl.forceTarget || where) {
@@ -941,7 +939,7 @@ var Buffer = Module("Buffer", {
         if (win && (win.scrollMaxX > 0 || win.scrollMaxY > 0))
             return win;
 
-        let win = this.focusedFrame;
+        win = this.focusedFrame;
         if (win && (win.scrollMaxX > 0 || win.scrollMaxY > 0))
             return win;
 
diff --git a/common/modules/commands.jsm b/common/modules/commands.jsm
index 7c1d2534..0e58b6b0 100644
--- a/common/modules/commands.jsm
+++ b/common/modules/commands.jsm
@@ -521,7 +521,7 @@ var CommandHive = Class("CommandHive", Contexts.Hive, {
             return { map: map, specs: specs };
         });
 
-        let cached = cache.get(this.cacheKey);
+        cached = cache.get(this.cacheKey);
         if (this.cached) {
             this._specs = cached.specs;
             for (let [k, v] in Iterator(cached.map))
@@ -765,8 +765,8 @@ var Commands = Module("commands", {
             // TODO: allow matching of aliases?
             function cmds(hive) hive._list.filter(cmd => cmd.name.startsWith(filter || ""))
 
-            let hives = (hives || this.userHives).map(h => [h, cmds(h)])
-                                                 .filter(([h, c]) => c.length);
+            hives = (hives || this.userHives).map(h => [h, cmds(h)])
+                                             .filter(([h, c]) => c.length);
 
             let list = ["table", {},
                 ["tr", { highlight: "Title" },
@@ -989,6 +989,7 @@ var Commands = Module("commands", {
 
         try {
 
+            let count, arg, quote, error;
             var { allowUnknownOptions, argCount, complete, extra, hereDoc, literal, options, keepQuotes } = params;
 
             if (!options)
@@ -1006,7 +1007,7 @@ var Commands = Module("commands", {
 
             // FIXME: best way to specify these requirements?
             var onlyArgumentsRemaining = allowUnknownOptions || options.length == 0; // after a -- has been found
-            var arg = null;
+            arg = null;
             var i = 0;
             var completeOpts;
 
@@ -1176,7 +1177,7 @@ var Commands = Module("commands", {
                 }
 
                 // if not an option, treat this token as an argument
-                let [count, arg, quote, error] = getNextArg(sub);
+                [count, arg, quote, error] = getNextArg(sub);
                 util.assert(!error, error);
 
                 if (complete) {
diff --git a/common/modules/completion.jsm b/common/modules/completion.jsm
index 7d2b6c11..6840b231 100644
--- a/common/modules/completion.jsm
+++ b/common/modules/completion.jsm
@@ -985,7 +985,7 @@ var Completion = Module("completion", {
     },
 
     addUrlCompleter: function addUrlCompleter(name, description, completer, ...args) {
-        let completer = Completion.UrlCompleter(name, description, completer);
+        completer = Completion.UrlCompleter(name, description, completer);
         completer.args = args;
         this.urlCompleters[name] = completer;
     },
diff --git a/common/modules/contexts.jsm b/common/modules/contexts.jsm
index 2a6e46dd..27f587fc 100644
--- a/common/modules/contexts.jsm
+++ b/common/modules/contexts.jsm
@@ -278,7 +278,7 @@ var Contexts = Module("contexts", {
         }
 
         let path = isRuntime ? file.getRelativeDescriptor(isRuntime) : file.path;
-        let name = isRuntime ? path.replace(/^(plugin|color)s([\\\/])/, "$1$2") : "script-" + path;
+        name = isRuntime ? path.replace(/^(plugin|color)s([\\\/])/, "$1$2") : "script-" + path;
 
         if (!group)
             group = this.addGroup(commands.nameRegexp
@@ -307,8 +307,8 @@ var Contexts = Module("contexts", {
         if (uri instanceof Ci.nsIFileURL)
             var file = File(uri.file);
 
-        let isPlugin = io.getRuntimeDirectories("plugins")
-                         .find(dir => dir.contains(file, true));
+        isPlugin = io.getRuntimeDirectories("plugins")
+                     .find(dir => dir.contains(file, true));
 
         let name = isPlugin && file && file.getRelativeDescriptor(isPlugin)
                                            .replace(File.PATH_SEP, "-");
diff --git a/common/modules/help.jsm b/common/modules/help.jsm
index 43330c92..298309d4 100644
--- a/common/modules/help.jsm
+++ b/common/modules/help.jsm
@@ -380,7 +380,7 @@ var Help = Module("Help", {
                 addDataEntry(file + ".xhtml", data.join(""));
             }
 
-            let data = [h for (h in highlight) if (styles.has(h.class) || /^Help/.test(h.class))]
+            data = [h for (h in highlight) if (styles.has(h.class) || /^Help/.test(h.class))]
                 .map(h => h.selector
                            .replace(/^\[.*?=(.*?)\]/, ".hl-$1")
                            .replace(/html\|/g, "") + "\t" + "{" + h.cssText + "}")