Cut other aggregations over to use collectExistingBucket() if a bucket ord has been hit, that already exists.

Closes #5955