Tentative fix for more clang/apple failures.