Adjustments to queue_move/queue_remove, mostly for consistency