[jhc] darcs patch: clean up renaming code, collect free var... (and 6 more)