Good call; that could certainly be more graceful. I think simply restarting the timer is fine here--it means that we'll have some cases where the drains stay open several timer intervals longer than the max TTL, but the max TTL is more of a guideline than a maximum that requires strict adherence.