Continued profiler loading cleanup (PR#2816 follow up)