Rework how a queue is defined.