Move MPSC/SPMC to use new method. Cleanup some leftovers in MPMC.