Some minor refactoring, plus clean-up of the queue interface