Greatly simplify Aggregate.