Fix SUBSCRIBE/UNSUBSCRIBE logic to allow subscriptions to be created and removed more than once.