More work on the queue module.