Tighter coupling of subscription expiry logic with other subscription management. The previous implementation could detect an expired subscription, allow another client to subscribe to it, and then stop the (now active) subscription.