Fix string/binary mismatches left behind by earlier commits