Fix mix of character/code point counts