Clang/Mac build fix after r108119