Fix user variables to properly evaluate.