Address comments

Reduce down to one counter variable.
Eliminate decrement at unqueue/increment at start request
Update counter emit aligned with counter increment/decrement.