Variable expression evaluation changes

Additional changes to fully support evaluating expressions with a given
set of variables.