Fix mutation operators to work with literals and variables.
Merge branch 'master' into rewrite