OptimisticQueue, RWQueue refactoring (issues #1,#2,#3)