Cleanup BlockingQueue<T> code