Fix clang test regressions in last commit.