Change unsubscribe kvo crash fix to be more robust.