Smoothed out the unicode handling a little bit