Clean up Profiler a bit.