on behalf of Jan Medved: clean up codepoints