Fix more mixes of character/code point counts