The cleanup will be unnecessary if the event delegates themselves are unsubscribed. That closes another todo, so I've done that and added a comment instead.