Fix up character type checks.