Miscellaneous cleanup.  Ready for eval section