diff --git a/content/buffer.js b/content/buffer.js
index 34ee6323..00222b47 100644
--- a/content/buffer.js
+++ b/content/buffer.js
@@ -201,7 +201,7 @@ function Buffer() //{{{
         {
             if (mappings.repeat)
             {
-                for (let i in util.rangeInterruptable(0, Math.max(count, 1), 100))
+                for (let i in util.interruptableRange(0, Math.max(count, 1), 100))
                     mappings.repeat();
             }
         },
diff --git a/content/completion.js b/content/completion.js
index f4551b3d..20b64ac0 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -588,7 +588,7 @@ function Completion() //{{{
             }
         }
         if (options.get("wildoptions").has("sort"))
-            filtered = filtered.sort(function ciCompare(a, b) util.ciCompare(a[0], b[0]));;
+            filtered = filtered.sort(function (a, b) util.ciCompare(a[0], b[0]));;
         return filtered;
     }
 
@@ -629,7 +629,7 @@ function Completion() //{{{
             }
         }
         if (options.get("wildoptions").has("sort"))
-            filtered = filtered.sort(function ciCompare(a, b) util.ciCompare(a[0], b[0]));;
+            filtered = filtered.sort(function (a, b) util.ciCompare(a[0], b[0]));;
         return filtered;
     }
 
@@ -767,7 +767,7 @@ function Completion() //{{{
 
             filtered = filtered.concat(additionalCompletions);
             if (options.get("wildoptions").has("sort"))
-                filtered = filtered.sort(function ciCompare(a, b) util.ciCompare(a[0], b[0]));;
+                filtered = filtered.sort(function (a, b) util.compareIgnoreCase(a[0], b[0]));;
             return filtered;
         },
 
diff --git a/content/hints.js b/content/hints.js
index 77e52229..f9d6180d 100644
--- a/content/hints.js
+++ b/content/hints.js
@@ -196,7 +196,7 @@ function Hints() //{{{
             var scrollY = doc.defaultView.scrollY;
 
         inner:
-            for (let i in (util.rangeInterruptable(start, end + 1, 500)))
+            for (let i in (util.interruptableRange(start, end + 1, 500)))
             {
                 let hint = pageHints[i];
                 [elem, text, span, imgspan] = hint;
diff --git a/content/liberator.js b/content/liberator.js
index eddaed19..77bb5fe3 100644
--- a/content/liberator.js
+++ b/content/liberator.js
@@ -394,7 +394,7 @@ const liberator = (function () //{{{
                         let each, eachUnits, totalUnits;
                         let total = 0;
 
-                        for (let i in util.rangeInterruptable(0, count, 500))
+                        for (let i in util.interruptableRange(0, count, 500))
                         {
                             let now = Date.now();
                             liberator[method](args);
diff --git a/content/options.js b/content/options.js
index 3a5f3c19..3a83c377 100644
--- a/content/options.js
+++ b/content/options.js
@@ -690,10 +690,6 @@ function Options() //{{{
             {
                 var optionCompletions = [];
 
-                // What is this all about then, eh? It's too late to guess... -- djk
-                //if (prefix)
-                //    filter = filter.replace(ret.prefix, "");
-
                 if (special) // list completions for about:config entries
                 {
                     var prefs = Components.classes["@mozilla.org/preferences-service;1"]
@@ -851,6 +847,14 @@ function Options() //{{{
     liberator.registerObserver("load_completion", function ()
     {
         completion.setFunctionCompleter(options.get, [function () ([o.name, o.description] for (o in options))]);
+        let listPrefs = [function () Components.classes["@mozilla.org/preferences-service;1"]
+                                               .getService(Components.interfaces.nsIPrefBranch)
+                                               .getChildList("", { value: 0 })
+                                               .map(function (pref) [pref, ""])];
+        completion.setFunctionCompleter(options.getPref, listPrefs);
+        completion.setFunctionCompleter(options.setPref, listPrefs);
+        completion.setFunctionCompleter(options.resetPref, listPrefs);
+        completion.setFunctionCompleter(options.invertPref, listPrefs);
     });
 
     return {
diff --git a/content/util.js b/content/util.js
index 3517fa4d..01c12ebc 100644
--- a/content/util.js
+++ b/content/util.js
@@ -130,7 +130,7 @@ const util = { //{{{
         };
     },
 
-    ciCompare: function (a, b)
+    compareIgnoreCase: function (a, b)
     {
         return String.localeCompare(a.toLowerCase(), b.toLowerCase());
     },
@@ -357,7 +357,7 @@ const util = { //{{{
             yield start++;
     },
 
-    rangeInterruptable: function (start, end, time)
+    interruptableRange: function (start, end, time)
     {
         let endTime = Date.now() + time;
         while (start < end)