diff --git a/lua/argonaut/options.lua b/lua/argonaut/options.lua
index e7a9d0e..a261c5f 100644
--- a/lua/argonaut/options.lua
+++ b/lua/argonaut/options.lua
@@ -30,8 +30,6 @@ local function setup(opt)
 end
 
 local function query(param_name, pairing)
-    assert(pairing)
-
     local default_param_value = options_current.default[param_name]
     local param_value = default_param_value
 
diff --git a/lua/argonaut/param.lua b/lua/argonaut/param.lua
index 8c02719..64abf16 100644
--- a/lua/argonaut/param.lua
+++ b/lua/argonaut/param.lua
@@ -41,23 +41,23 @@ function ParamRangeCell.new(range)
 end
 
 function ParamRangeCell:write(builder, wrapped)
-    self.value:write(builder, wrapped)
+    self.range:write(builder, wrapped)
 end
 
 function ParamRangeCell:hit_test(cursor)
-    return self.value:hit_test(cursor)
+    return self.range:hit_test(cursor)
 end
 
 function ParamRangeCell:hit_search(trace, depth)
-    return self.value:hit_search(trace, depth + 1)
+    return self.range:hit_search(trace, depth + 1)
 end
 
 function ParamRangeCell:get_start_row()
-    return self.value.start_cursor.row
+    return self.range.start_cursor.row
 end
 
 function ParamRangeCell:get_stop_row()
-    return self.value.stop_cursor.row
+    return self.range.stop_cursor.row
 end
 
 function ParamRangeCell:is_empty()
@@ -77,7 +77,7 @@ function Param.new_cursor_cell(cursor)
 end
 
 function Param.new_range_cell(range)
-    return ParamRangeCell(range)
+    return ParamRangeCell.new(range)
 end
 
 function Param:append(cell)