Some minor tweaks.  There seems to be some kind of problem with the test harness and unicode.