Tiny tweak to Expressions
Even better variable evaluation.