Made profiler ready for Andrew's overhaul.