Deal with unicode field keys properly

This would have been fixed properly in the previous change if
I had made a test like a good boy.
release 2.1.4