Really fix the case where a UTF-16 string contains junk after the string.