Fix CLI bug where incorrect variables would be set when similarly named
variables are used.

Previously the following was broken:

set option = 1
set option_extra = 2

Instead of setting 'option_extra' to two 'option' was set to 2 if
'option' appeared before 'option_extra' in the list of settings.