* Correct heap implementation in TimerQueue, which would sometimes extract timers in the wrong order after a node other than the root was removed * Factor out old heap rebuilding code into its own method to satisfy codeclimate requirements
