diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml
index 69b64959..31f2af54 100644
--- a/common/locale/en-US/map.xml
+++ b/common/locale/en-US/map.xml
@@ -471,8 +471,8 @@
     <description>
         <p>
             Abbreviate a key sequence for Command Line mode. Same as
-            <ex>:ab<oa>breviate</oa></ex>, but for
-            <t>Command Line</t> mode only.
+            <ex>:ab<oa>breviate</oa></ex>, but for &mode.command-line; mode
+            only.
         </p>
     </description>
 </item>
@@ -506,8 +506,8 @@
     <description>
         <p>
             Remove abbreviation(s) for Command Line mode. Same as
-            <ex>:una<oa>bbreviate</oa></ex>, but for
-            <t>Command Line</t> mode only.
+            <ex>:una<oa>bbreviate</oa></ex>, but for &mode.command-line; mode
+            only.
         </p>
     </description>
 </item>
diff --git a/common/modules/config.jsm b/common/modules/config.jsm
index 11dd9488..4da5a88d 100644
--- a/common/modules/config.jsm
+++ b/common/modules/config.jsm
@@ -217,6 +217,7 @@ var ConfigBase = Class("ConfigBase", {
 
         "tag.command-line": <link topic="command-line">command line</link>,
         "tag.status-line":  <link topic="status-line">status line</link>,
+        "mode.command-line": <link topic="command-line-mode">Command Line</link>,
     },
 
     dtdStrings: [
diff --git a/common/modules/prefs.jsm b/common/modules/prefs.jsm
index 3fcaf4be..c7b09eec 100644
--- a/common/modules/prefs.jsm
+++ b/common/modules/prefs.jsm
@@ -324,7 +324,7 @@ var Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
      *
      * @see #withContext
      */
-    pushContext: function () {
+    pushContext: function pushContext() {
         this._prefContexts.push({});
     },
 
@@ -333,7 +333,7 @@ var Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
      *
      * @see #withContext
      */
-    popContext: function () {
+    popContext: function popContext() {
         for (let [k, v] in Iterator(this._prefContexts.pop()))
             this.set(k, v);
     },
@@ -348,7 +348,7 @@ var Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
      * @see #pushContext
      * @see #popContext
      */
-    withContext: function (func, self) {
+    withContext: function withContext(func, self) {
         try {
             this.pushContext();
             return func.call(self);
@@ -359,7 +359,7 @@ var Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
     }
 }, {
 }, {
-    completion: function (dactyl, modules) {
+    completion: function init_completion(dactyl, modules) {
         modules.completion.preference = function preference(context) {
             context.anchored = false;
             context.title = [config.host + " Preference", "Value"];
@@ -367,7 +367,7 @@ var Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
             context.completions = prefs.getNames();
         };
     },
-    javascript: function (dactyl, modules) {
+    javascript: function init_javascript(dactyl, modules) {
         modules.JavaScript.setCompleter([this.get, this.safeSet, this.set, this.reset, this.toggle],
                 [function (context) (context.anchored=false, this.getNames().map(function (pref) [pref, ""]))]);
     }