cleanup commit - starting to fix some unclean aspects of instrumentation and allocation hooks