Improvements to timer hack.