Ensure there's a thread for timer events.

Also, a minor simplification.