Fix bug in RenameFreeVars mutator
Rework simplification of EQ to avoid an infinite loop.