Clean up.
Improve handling unicode 6.0 characters.