Fixup timer_factory for old compilers.
Fixup unit tests for old compilers.