diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index d929b830..43af7701 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -1083,7 +1083,7 @@ function QuickMarks() //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    var qmarks = storage.newMap("quickmarks", true);
+    var qmarks = storage.newMap("quickmarks", { store: true });
 
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// MAPPINGS ////////////////////////////////////////////////
diff --git a/common/content/buffer.js b/common/content/buffer.js
index 3a435dc3..abdc9a0c 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -1581,8 +1581,8 @@ function Marks() //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    var localMarks = storage.newMap("local-marks", true, { privateData: true });
-    var urlMarks = storage.newMap("url-marks", true, { privateData: true });
+    var localMarks = storage.newMap("local-marks", { store: true, privateData: true });
+    var urlMarks = storage.newMap("url-marks", { store: true, privateData: true });
 
     var pendingJumps = [];
     var appContent = document.getElementById("appcontent");
diff --git a/common/content/events.js b/common/content/events.js
index bf80129c..f7ecf780 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -338,7 +338,7 @@ function Events() //{{{
 
     var lastFocus = null;
 
-    var macros = storage.newMap("macros", true, { privateData: true });
+    var macros = storage.newMap("macros", { store: true, privateData: true });
 
     var currentMacro = "";
     var lastMacro = "";
diff --git a/common/content/liberator.js b/common/content/liberator.js
index 43599c04..53fcbec3 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -1783,7 +1783,7 @@ const liberator = (function () //{{{
                 }
                 if (liberator.storeErrors)
                 {
-                    let errors = storage.newArray("errors", false);
+                    let errors = storage.newArray("errors", { store: false });
                     errors.toString = function () [String(v[0]) + "\n" + v[1] for ([k, v] in this)].join("\n\n");
                     errors.push([new Date, obj + obj.stack]);
                 }
diff --git a/common/content/options.js b/common/content/options.js
index 1fff33be..232c0d56 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -441,7 +441,7 @@ function Options() //{{{
             opt.set(opt.value, options.OPTION_SCOPE_GLOBAL);
     }
 
-    storage.newMap("options", false);
+    storage.newMap("options", { store: false });
     storage.addObserver("options", optionObserver, window);
 
     function storePreference(name, value)
diff --git a/common/content/ui.js b/common/content/ui.js
index 028a8be1..61782568 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -26,8 +26,8 @@ function CommandLine() //{{{
 
     const callbacks = {};
 
-    storage.newArray("history-search", true, { privateData: true });
-    storage.newArray("history-command", true, { privateData: true });
+    storage.newArray("history-search", { store: true, privateData: true });
+    storage.newArray("history-command", { store: true, privateData: true });
 
     // Really inideal.
     let services = modules.services; // Storage objects are global to all windows, 'modules' isn't.
diff --git a/common/modules/storage.jsm b/common/modules/storage.jsm
index e26efa2e..dc72ca95 100644
--- a/common/modules/storage.jsm
+++ b/common/modules/storage.jsm
@@ -320,14 +320,14 @@ var storage = {
         return keys[key];
     },
 
-    newMap: function newMap(key, store, options)
+    newMap: function newMap(key, options)
     {
-        return this.newObject(key, ObjectStore, store, options);
+        return this.newObject(key, ObjectStore, options);
     },
 
-    newArray: function newArray(key, store, options)
+    newArray: function newArray(key, options)
     {
-        return this.newObject(key, ArrayStore, store, { type: Array, __proto__: options });
+        return this.newObject(key, ArrayStore, { type: Array, __proto__: options });
     },
 
     addObserver: function addObserver(key, callback, ref)