I'd quite like to refactor the aggregation stream handler stuff anyway, so rather than try to do two things in one PR I'm happy to let leave these as is. They can serve as an even more obvious reminder to refactor! :wink: