renamed ValueVariable -> VariableExpression, cleaned up usage