This fixes some FAILs seen with --disable-wchar_t, and for targets
where that's the default.

Tested powerpc64le-linux, committed to trunk.