diff --git a/common/content/options.js b/common/content/options.js
index 9ea4ef5c..00bf0745 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -1187,7 +1187,7 @@ function Options() //{{{
             if (!filter)
                 filter = "";
 
-            let prefArray = services.get("pref").getChildList("", { value: 0 });
+            let prefArray = options.allPrefs();
             prefArray.sort();
             let prefs = function () {
                 for (let [, pref] in Iterator(prefArray))
diff --git a/common/content/sanitizer.js b/common/content/sanitizer.js
index 579ccf93..4db4f33d 100644
--- a/common/content/sanitizer.js
+++ b/common/content/sanitizer.js
@@ -311,15 +311,8 @@ function Sanitizer() //{{{
         return errors;
     };
 
-    self.__defineGetter__("prefNames", function () {
-        let ret = [];
-
-        [self.prefDomain, self.prefDomain2].forEach(function (branch) {
-            ret = ret.concat(services.get("pref").getBranch(branch).getChildList("", {}).map(function (pref) branch + pref));
-        });
-
-        return ret;
-    });
+    self.__defineGetter__("prefNames",
+        function () util.Array.flatten([self.prefDomain, self.prefDomain2].map(options.allPrefs)));
     //}}}
 
     return self;