A bit of cleanup on the aggregator and box-building.