Renaming to help valgrind.

Delayed commit. Lots of general tweaks and unliekly to be workable
build.