Improved convergence detection.

Only aggregating when necessary now.