Some more work on the unicode implementation.