Fix test breakages in s_* suites after musl_charfuncs merge.