diff --git a/common/content/options.js b/common/content/options.js
index 8d3f4c19..9c486fe0 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;
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 7ca46281..bd3eb6ae 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 value)
+                    for (let [, opt] in Iterator(this.parseValue(value)))
                     {
                         if (opt == "tab")
                             open = 3;