Tidy up timing code a bit.