A few changes to make queues slightly nicer to deal with.