Fix recent regression that broke several llvm-tests.