Code rearranged in QueueDebugger