Updating for recent clang.