XX-10951:  Bug fix for unlocked mutex in register timer.  Improved macro names.