Final little refactor of the queue thing.