Fix value renaming. Cleanup code, fix a few leaks.

4 files changed