Sorry @graingert — it’s early 
— I’m not quite following…
All you’ve effectively done there is remove the aclosing() no? 
(Assuming .streaming_cmgr_content is just tweaked streaming_content)
This may go easier if you create a branch on your fork with some test cases showing the behaviour?