Great; I made this change in 15f72c0 and it certainly seems a lot cleaner; no more continual re-canceling of timers for active drains.