Improvements to min-expires fix

- Send new register immediately instead of after immediate timeout.
- Safety improvements to timeout handle usage - make sure we don't
  accidentally clear some other timeout.