Fix another issue building with clang on HEAD