Tick, Tick, Tick

I found and fixed one more bug today that I introduced when I refactored a bunch of code that had failed. The uptime tests are running pretty well.

There is some serious danger that we might arrive at the end of the road here.

If so, there will be much rejoicing.