diff -r 14865bd92db6 -r d4403c135a96 src/modules/misc.py
--- a/src/modules/misc.py	Tue Mar 04 10:49:30 2014 -0800
+++ b/src/modules/misc.py	Wed Mar 05 10:36:13 2014 -0800
@@ -1356,7 +1356,7 @@
                 if len(entry) == 2:
                         opt, default = entry
                 elif len(entry) == 3:
-                        opt, default, valid_args = entry
+                        opt, default, dummy_valid_args = entry
                 assert opt in opts_mapping
                 sopt, lopt = opts_mapping[opt]
                 # make sure an option was specified
@@ -1388,7 +1388,7 @@
                         if len(x) == 2:
                                 opt, default = x
                         elif len(x) == 3:
-                                opt, default, valid_args = x
+                                opt, default, dummy_valid_args = x
                         if option == opt:
                                 return default