Minor Timer refactor.