Rearrange code to clarify purpose of intermediate.
Comment in timing header file.
Comment on #ifdef