^x variables should always refer to the value before the expression

Closes #1307