More robust subscribe/unsubscribe.