Moved the timing macros to get finer-grained information.