first pass profiler cleanup - tidy up macros