Changes to the timer library (which is no longer a library, per se...)