Fix c_string related build and test regressions.