diff --git a/common/content/mappings.js b/common/content/mappings.js
index f14b3d2f..d39b0ee9 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -771,7 +771,9 @@ var Mappings = Module("mappings", {
             format: {
                 description: function (map) (XML.ignoreWhitespace = false, XML.prettyPrinting = false, <>
                         {options.get("passkeys").has(map.name)
-                            ? <span highlight="URLExtra">(passed by {template.helpLink("'passkeys'")})</span>
+                            ? <span highlight="URLExtra">
+                                ({template.linkifyHelp(_("option.passkeys.passedBy"))})
+                              </span>
                             : <></>}
                         {template.linkifyHelp(map.description + (map.rhs ? ": " + map.rhs : ""))}
                 </>),
@@ -779,7 +781,7 @@ var Mappings = Module("mappings", {
                     char === "n" ? map.name : char ? char + "_" + map.name : "",
                 headings: ["Command", "Mode", "Group", "Description"]
             }
-        }
+        };
 
         dactyl.addUsageCommand({
             __proto__: args,
diff --git a/common/modules/help.jsm b/common/modules/help.jsm
index 20b144d9..64973466 100644
--- a/common/modules/help.jsm
+++ b/common/modules/help.jsm
@@ -233,7 +233,7 @@ var Help = Module("Help", {
         init: function init() {
             dactyl.commands["dactyl.help"] = function (event) {
                 let elem = event.originalTarget;
-                help.help(elem.getAttribute("tag") || elem.textContent);
+                modules.help.help(elem.getAttribute("tag") || elem.textContent);
             };
         },
 
diff --git a/common/modules/options.jsm b/common/modules/options.jsm
index f579cef8..d4929805 100644
--- a/common/modules/options.jsm
+++ b/common/modules/options.jsm
@@ -1068,25 +1068,6 @@ var Options = Module("options", {
     commands: function initCommands(dactyl, modules, window) {
         const { commands, contexts, options } = modules;
 
-        let args = {
-            getMode: function (args) findMode(args["-mode"]),
-            iterate: function (args) {
-                for (let map in mappings.iterate(this.getMode(args)))
-                    for (let name in values(map.names))
-                        yield { name: name, __proto__: map };
-            },
-            format: {
-                description: function (map) (XML.ignoreWhitespace = false, XML.prettyPrinting = false, <>
-                        {options.get("passkeys").has(map.name)
-                            ? <span highlight="URLExtra">({
-                                tempate.linkifyHelp(_("option.passkeys.passedBy"))
-                              })</span>
-                            : <></>}
-                        {template.linkifyHelp(map.description)}
-                </>)
-            }
-        };
-
         dactyl.addUsageCommand({
             name: ["listo[ptions]", "lo"],
             description: "List all options along with their short descriptions",