Fix another issue building with CLANG on HEAD