Small tweaks to new profiler for better readability and scalability.