diff --git a/content/commands.js b/content/commands.js
index fe8f1b30..a2ad2983 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -289,7 +289,7 @@ function Commands() //{{{
                 if (val != null)
                     res.push(quote(val));
             }
-            for (let [,arg] in Iterator(args || []))
+            for (let [,arg] in Iterator(args.arguments || []))
                 res.push(quote(arg));
 
             let str = args.literalArg;
diff --git a/content/options.js b/content/options.js
index c0661ba8..e4ece8e0 100644
--- a/content/options.js
+++ b/content/options.js
@@ -950,8 +950,11 @@ function Options() //{{{
             let ret = {};
             let matches, prefix, postfix, valueGiven;
 
-            [matches, prefix, ret.name, postfix, valueGiven, ret.operator, ret.value] =
+            let [matches, prefix, name, postfix, valueGiven, operator, value] =
             args.match(/^\s*(no|inv)?([a-z_]+)([?&!])?\s*(([-+^]?)=(.*))?\s*$/) || [];
+            ret.name = name;
+            ret.operator = operator;
+            ret.value = value;
 
             ret.args = args;
             ret.onlyNonDefault = false; // used for :set to print non-default options