[Tidy-First]: Fix timings object for hooks and macros, and make types of timings explicit

[Tidy-First]: Fix timings object for hooks and macros, and make types of timings explicit #512