Clean up timer_wrap further.