Further work on improving timer counting.