diff --git a/common/content/commandline.js b/common/content/commandline.js
index f1ec7d79..a838e4bd 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -1115,9 +1115,9 @@ var CommandLine = Module("commandline", {
             }
 
             // TODO: Wouldn't multiple handlers be cleaner? --djk
-            if (event.type == "click" && (event.target instanceof HTMLAnchorElement ||
-                                          event.originalTarget.hasAttributeNS(NS, "command"))) {
+            if (event.type == "click" && event.target instanceof HTMLAnchorElement) {
 
+                util.dump(event.getPreventDefault(), event.target);
                 if (event.getPreventDefault())
                     return;
 
diff --git a/common/content/modes.js b/common/content/modes.js
index a32011af..023e9ca5 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -60,9 +60,10 @@ var Modes = Module("modes", {
         this.addMode("VISUAL", {
             char: "v",
             description: "Active when text is selected",
+            display: function () "VISUAL" + (this._extended & modes.LINE ? " LINE" : ""),
             bases: [this.COMMAND],
             ownsFocus: true,
-            display: function () "VISUAL" + (this._extended & modes.LINE ? " LINE" : "")
+            passUnknown: false
         }, {
             leave: function (stack, newMode) {
                 if (newMode.main == modes.CARET) {
@@ -98,7 +99,8 @@ var Modes = Module("modes", {
             char: "t",
             description: "Vim-like editing of input elements",
             bases: [this.COMMAND],
-            ownsFocus: true
+            ownsFocus: true,
+            passUnknown: false
         });
         this.addMode("OUTPUT_MULTILINE", {
             description: "Active when the multi-line output buffer is open",
@@ -432,11 +434,7 @@ var Modes = Module("modes", {
 
         get bases() this.input ? [modes.INPUT] : [modes.MAIN],
 
-        get toStringParams() [this.name],
-
-        valueOf: function () this.id,
-
-        count: true,
+        get count() !this.input,
 
         get description() this._display,
 
@@ -450,7 +448,13 @@ var Modes = Module("modes", {
 
         input: false,
 
-        get mask() this
+        passUnknown: false,
+
+        get mask() this,
+
+        get toStringParams() [this.name],
+
+        valueOf: function () this.id
     }, {
         _id: 0
     }),
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index 70f46cbe..5016950d 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -327,8 +327,8 @@
 
 <item>
     <tags>'act' 'activate'</tags>
-    <spec>'activate' 'act'</spec>
     <strut/>
+    <spec>'activate' 'act'</spec>
     <type>stringlist</type>
     <default>addons,bookmarks,diverted,downloads,extoptions,
           help,homepage,quickmark,tabopen,paste</default>
@@ -853,8 +853,8 @@
 
 <item>
     <tags>'ht' 'hinttags'</tags>
-    <spec>'hinttags' 'ht'</spec>
     <strut/>
+    <spec>'hinttags' 'ht'</spec>
     <type>string</type>
     <default>&hinttags;</default>
     <description>
@@ -1062,8 +1062,8 @@
 
 <item>
     <tags>'nextpattern'</tags>
-    <spec>'nextpattern'</spec>
     <strut/>
+    <spec>'nextpattern'</spec>
     <type>stringlist</type>
     <default>'\bnext',^>$,'^(>>|»)$','^(>|»)','(>|»)$','\bmore\b'</default>
     <description>
@@ -1166,8 +1166,8 @@
 
 <item>
     <tags>'previouspattern'</tags>
-    <spec>'previouspattern'</spec>
     <strut/>
+    <spec>'previouspattern'</spec>
     <type>stringlist</type>
     <default><![CDATA['\bprev|previous\b',^<$,'^(<<|«)$','^(<|«)','(<|«)$']]></default>
     <description>
@@ -1466,8 +1466,8 @@
 
 <item>
     <tags>'wia' 'wildanchor'</tags>
-    <spec>'wildanchor' 'wia'</spec>
     <strut/>
+    <spec>'wildanchor' 'wia'</spec>
     <type>regexplist</type>
     <default>!'/ex/(back|buffer|ext|forward|help|undo)'</default>
     <description>
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 071688eb..caaab70b 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -427,7 +427,7 @@ function isinstance(object, interfaces) {
             if (objproto.toString.call(object) === "[object " + interfaces[i] + "]")
                 return true;
         }
-        else if ("isinstance" in object && object.isinstance !== isinstance) {
+        else if (typeof object === "object" && "isinstance" in object && object.isinstance !== isinstance) {
             if (object.isinstance(interfaces[i]))
                 return true;
         }