Small cleanup in the queue structure.