diff --git a/common/content/buffer.js b/common/content/buffer.js
index 0bc91e3a..44ff76f4 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -940,17 +940,8 @@ function Buffer() //{{{
          * @property {Node} The last focused input field in the buffer. Used
          *     by the "gi" key binding.
          */
-        get lastInputField()
-        {
-            if (window.content.document.lastInputField)
-                return window.content.document.lastInputField;
-            else
-                return null;
-        },
-        set lastInputField(value)
-        {
-            window.content.document.lastInputField = value;
-        },
+        get lastInputField() window.content.document.lastInputField || null,
+        set lastInputField(value) { window.content.document.lastInputField = value; },
 
         /**
          * @property {string} The current top-level document's URL.
diff --git a/common/content/modes.js b/common/content/modes.js
index 978df063..2c9932ce 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -110,8 +110,6 @@ const modes = (function () //{{{
 
         get all() mainModes.slice(),
 
-        get inputMode() main & (this.COMMAND_LINE | this.INPUT | this.TEXTAREA | this.COMPOSE),
-
         get mainModes() (mode for ([k, mode] in Iterator(modeMap)) if (!mode.extended && mode.name == k)),
 
         get mainMode() modeMap[main],