Cleanup, plus some tweaks for more accurate profiling
Callchain and inlining support