QueueOverflow refactoring