Queue redesign (partial).