Formatting cleanups for aggregation.