Fix for potential deadlock when a subscription expires.  See #455.