diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index 8b5f7574..3b8b7e94 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -249,7 +249,7 @@ function Bookmarks() //{{{
         statusline.updateUrl();
     };
 
-    var cache = storage.newObject("bookmark-cache", Cache, false);
+    var cache = storage.newObject("bookmark-cache", Cache, { store: false });
     storage.addObserver("bookmark-cache", bookmarkObserver, window);
 
     /////////////////////////////////////////////////////////////////////////////}}}
diff --git a/common/content/browser.js b/common/content/browser.js
index bb64c16b..445606b4 100644
--- a/common/content/browser.js
+++ b/common/content/browser.js
@@ -99,7 +99,7 @@ function Browser() //{{{
                     }
                 }
             }).init();
-        }, false);
+        }, { store: false });
         storage.addObserver("private-mode",
             function (key, event, value) {
                 autocommands.trigger("PrivateMode", { state: value });
diff --git a/common/content/style.js b/common/content/style.js
index 60eb410b..0fc4779b 100644
--- a/common/content/style.js
+++ b/common/content/style.js
@@ -581,12 +581,12 @@ let (array = util.Array)
 /**
  * @property {Styles}
  */
-const styles = storage.newObject("styles", Styles, false);
+const styles = storage.newObject("styles", Styles, { store: false });
 
 /**
  * @property {Highlights}
  */
-const highlight = storage.newObject("highlight", Highlights, false);
+const highlight = storage.newObject("highlight", Highlights, { store: false });
 
 if (highlight.CSS != Highlights.prototype.CSS)
 {
diff --git a/common/content/ui.js b/common/content/ui.js
index 6bdaecd6..cb43c4b2 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -56,7 +56,7 @@ function CommandLine() //{{{
                 }
             }
         }).init();
-    }, false);
+    }, { store: false });
     storage.addObserver("sanitize",
         function (key, event, value) {
             autocommands.trigger("Sanitize", {});
diff --git a/common/modules/storage.jsm b/common/modules/storage.jsm
index 47fad206..e26efa2e 100644
--- a/common/modules/storage.jsm
+++ b/common/modules/storage.jsm
@@ -306,14 +306,14 @@ var timers = {};
 
 var storage = {
     alwaysReload: {},
-    newObject: function newObject(key, constructor, store, type, options, reload)
+    newObject: function newObject(key, constructor, params)
     {
-        if (!(key in keys) || reload || this.alwaysReload[key])
+        if (!(key in keys) || params.reload || this.alwaysReload[key])
         {
-            if (key in this && !(reload || this.alwaysReload[key]))
+            if (key in this && !(params.reload || this.alwaysReload[key]))
                 throw Error();
-            let load = function () loadPref(key, store, type || Object);
-            keys[key] = new constructor(key, store, load, options || {});
+            let load = function () loadPref(key, params.store, params.type || Object);
+            keys[key] = new constructor(key, params.store, load, params);
             timers[key] = new Timer(1000, 10000, function () storage.save(key));
             this.__defineGetter__(key, function () keys[key]);
         }
@@ -322,12 +322,12 @@ var storage = {
 
     newMap: function newMap(key, store, options)
     {
-        return this.newObject(key, ObjectStore, store, null, options);
+        return this.newObject(key, ObjectStore, store, options);
     },
 
     newArray: function newArray(key, store, options)
     {
-        return this.newObject(key, ArrayStore, store, Array, options);
+        return this.newObject(key, ArrayStore, store, { type: Array, __proto__: options });
     },
 
     addObserver: function addObserver(key, callback, ref)