Merge accumulators and minor cleanups.