This, and remove needed to change in order to be able to support concurrent queue implementations.