Remove the other bogus KIND from here; it looks like old kruft
Propagate the use of MPI_COUNT_KIND everywhere.