Further fix to unicode_output_stream.