Moved some JobQueueAggregator logic out of JobQueueGroup