Kstat cleanup

A few kstat counters need fixing up following recent restructuring work.  See individual commit messages for details.