Performance Improvements to Queue-and-Counter

... but still failing some unit tests, haven't tracked them down.
... queue-and-lock is still the winner.