Merge "Simplified some tedious profiling code"