Fix more problems with un-terminated characters.