Minor cleanup and better warning messages when listeners are unsubscribed.