Relaxing variable renaming rules, to allow variables to keep their user-defined name more often
Shortened generated variable names. Fixed a couple bugs along the way.