NXBT-758: UTF-8 encoding; -Xlint compilerArg; cleanup code