Improved unicode handling.