Also, maybe push this down to a protected function in DistinctValueWithCountClientAggregator, since it looks like this is done by multiple classes?