diff --git a/content/liberator.js b/content/liberator.js
index fa91ea8d..33f536eb 100644
--- a/content/liberator.js
+++ b/content/liberator.js
@@ -560,8 +560,8 @@ const liberator = (function () //{{{
 
     return {
 
-        get mode()      { return liberator.modes.main; },
-        set mode(value) { liberator.modes.main = value; },
+        get mode()      liberator.modes.main,
+        set mode(value) liberator.modes.main = value,
 
         // Global constants
         CURRENT_TAB: 1,
diff --git a/content/mail.js b/content/mail.js
index 2e169842..38bbc8d8 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -747,7 +747,7 @@ liberator.Mail = function () //{{{
 
         return {
 
-        get currentAccount() { return this.currentFolder.rootFolder; },
+        get currentAccount() this.currentFolder.rootFolder,
 
         get currentFolder() {
             var tree = GetFolderTree();
diff --git a/content/modes.js b/content/modes.js
index 8a34bbad..bac7a3a2 100644
--- a/content/modes.js
+++ b/content/modes.js
@@ -191,9 +191,9 @@ liberator.modes = (function () //{{{
                 yield modes[i];
         },
 
-        get all() { return [this.NONE, this.NORMAL, this.INSERT, this.VISUAL,
-                            this.HINTS, this.COMMAND_LINE, this.CARET,
-                            this.TEXTAREA, this.MESSAGE, this.COMPOSE, this.CUSTOM]; },
+        get all() [this.NONE, this.NORMAL, this.INSERT, this.VISUAL,
+                   this.HINTS, this.COMMAND_LINE, this.CARET,
+                   this.TEXTAREA, this.MESSAGE, this.COMPOSE, this.CUSTOM],
 
         // show the current mode string in the command line
         show: function ()
@@ -301,9 +301,7 @@ liberator.modes = (function () //{{{
         },
 
         get extended() extended,
-        set extended(value) {
-            extended = value; this.show();
-        }
+        set extended(value) { extended = value; this.show(); }
 
     };
     //}}}
diff --git a/content/muttator.js b/content/muttator.js
index 74794f65..1fc53360 100644
--- a/content/muttator.js
+++ b/content/muttator.js
@@ -36,15 +36,12 @@ liberator.config = { //{{{
     defaults: { guioptions: "f" },
     guioptions: { m: ["mail-toolbar-menubar2"], T: ["mail-bar2"], f: ["folderPaneBox", "folderpane_splitter"], F: ["folderPaneHeader"] },
 
-    get isComposeWindow() { return window.wintype == "msgcompose"; },
-    get browserModes() { return [liberator.modes.MESSAGE]; },
-    get mainWidget() { // focusContent() focuses this widget
-        return this.isComposeWindow ?
-               document.getElementById("content-frame") :
-               GetThreadTree();
-    },
-    get mainWindowID() { return this.isComposeWindow ? "msgcomposeWindow" : "messengerWindow"; },
-    get visualbellWindow() { return document.getElementById(this.mainWindowID); },
+    get isComposeWindow() window.wintype == "msgcompose",
+    get browserModes() [liberator.modes.MESSAGE],
+    // focusContent() focuses this widget
+    get mainWidget() this.isComposeWindow ? document.getElementById("content-frame") : GetThreadTree(),
+    get mainWindowID() this.isComposeWindow ? "msgcomposeWindow" : "messengerWindow",
+    get visualbellWindow() document.getElementById(this.mainWindowID),
 
     autocommands: [["FolderLoaded",  "Triggered after switching folders in Thunderbird"],
                    ["PageLoadPre",   "Triggered after a page load is initiated"],
diff --git a/content/tabs.js b/content/tabs.js
index a1b3efdf..247721cc 100644
--- a/content/tabs.js
+++ b/content/tabs.js
@@ -643,9 +643,9 @@ liberator.Tabs = function () //{{{
 
     return {
 
-        get alternate() { return alternates[1]; },
+        get alternate() alternates[1],
 
-        get count() { return getBrowser().mTabs.length; },
+        get count() getBrowser().mTabs.length,
 
         // used for :setlocal
         get options()
diff --git a/content/vimperator.js b/content/vimperator.js
index 82c1ffd4..01f11cfd 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -36,7 +36,7 @@ liberator.config = { //{{{
     defaults: { guioptions: "" },
     guioptions: { m: ["toolbar-menubar"], T: ["nav-bar"], b: ["PersonalToolbar"] },
 
-    get visualbellWindow() { return getBrowser().mPanelContainer; },
+    get visualbellWindow() getBrowser().mPanelContainer,
 
     autocommands: [["BookmarkAdd",        "Triggered after a page is bookmarked"],
                    ["LocationChange",     "Triggered when changing tabs or when naviagtion to a new location"],