Further work to clean up timing logic.