Rename function arguments to be clearer on what they actually are
Allow the timer macros to be used in release builds