I'll make some rounds with this to see if removing that many of references and nesting may still allow correct unsubscription behavior.