These changes make the file pass iconv -f UTF-8 test and also permit the
file to be edited/saved by nvi without truncating the file.