Aggregator no longer accepts items in result slot. Lots of cleanup.