Cleanup. Use common class throughout. Implement cached counters for
MPSC/SPMC