Cleanup scattered timer calls to use macros