Fix for saving conditionals in variable expressions.