LockingQueue: refactoring after code-review