Improve unicode robustness.