Clean up unicode diff handling a little more.