Tighten various asserts in the expiry code and close what could
conceiveably be a race that might be able to cause #1405.