Consistent declaration and use of UTF-8 Charset constants, plus related polishing