container::OptimisticQueue refactoring