Also fix bug where bogus charset names like `iso` were confused with valid
charset names starting with that text, such as `iso-8859-2`.