diff --git a/common/content/liberator.js b/common/content/liberator.js
index a667a6e7..f4f6e320 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -185,7 +185,8 @@ const liberator = (function () //{{{
                         styles.addSheet(true, "scrollbar", "*", class.join(", ") + " { visibility: collapse !important; }", true);
                     else
                         styles.removeSheet(true, "scrollbar");
-                    options.safeSetPref("layout.scrollbar.side", opts.indexOf("l") >= 0 ? 3 : 2);
+                    options.safeSetPref("layout.scrollbar.side", opts.indexOf("l") >= 0 ? 3 : 2,
+                        "See 'guioptions' scrollbar flags.");
                 },
                 validator: function (opts) (opts.indexOf("l") < 0 || opts.indexOf("r") < 0)
             },
@@ -289,7 +290,8 @@ const liberator = (function () //{{{
             {
                 setter: function (value)
                 {
-                    options.safeSetPref("accessibility.typeaheadfind.enablesound", !value);
+                    options.safeSetPref("accessibility.typeaheadfind.enablesound", !value,
+                        "See 'visualbell' option");
                     return value;
                 }
             });
diff --git a/common/content/options.js b/common/content/options.js
index 8d3f4c19..eedda31c 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -251,16 +251,7 @@ Option.prototype = {
             return null;
 
         if (this.setter)
-        {
-            let tmpValue = newValue;
-            newValue = this.setter.call(this, newValue);
-
-            if (newValue === undefined)
-            {
-                newValue = tmpValue;
-                liberator.log("DEPRECATED: '" + this.name + "' setter should return a value");
-            }
-        }
+            newValue = this.setter(newValue);
 
         if (liberator.has("tabs") && (scope & options.OPTION_SCOPE_LOCAL))
             tabs.options[this.name] = newValue;
@@ -1308,13 +1299,18 @@ function Options() //{{{
          * @param {value} value The new preference value.
          */
         // FIXME: Well it used to. I'm looking at you mst! --djk
-        safeSetPref: function (name, value)
+        safeSetPref: function (name, value, message)
         {
             let val = loadPreference(name, null, false);
             let def = loadPreference(name, null, true);
             let lib = loadPreference(SAVED + name);
             if (lib == null && val != def || val != lib)
-                liberator.echomsg("Warning: setting preference " + name + ", but it's changed from its default value.");
+            {
+                let msg = "Warning: setting preference " + name + ", but it's changed from its default value.";
+                if (message)
+                    msg += " " + message;
+                liberator.echomsg(msg);
+            }
             storePreference(name, value);
             storePreference(SAVED + name, value);
         },
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 5914283b..fec81609 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -173,7 +173,7 @@ function Tabs() //{{{
                 setter: function (value)
                 {
                     let [open, restriction] = [1, 0];
-                    for (let [, opt] in Iterator(value.split(",")))
+                    for (let [, opt] in Iterator(this.parseValues(value)))
                     {
                         if (opt == "tab")
                             open = 3;
@@ -183,8 +183,8 @@ function Tabs() //{{{
                             restriction = 2;
                     }
 
-                    options.safeSetPref("browser.link.open_newwindow", open);
-                    options.safeSetPref("browser.link.open_newwindow.restriction", restriction);
+                    options.safeSetPref("browser.link.open_newwindow", open, "See 'popups' option.");
+                    options.safeSetPref("browser.link.open_newwindow.restriction", restriction, "See 'popups' option.");
                     return value;
                 },
                 completer: function (context) [