Changed coreprof macros to match coreprof.h, altered output to print self-time as...