Minor changes to profiling code to reduce bloating.