Fix compilation with clang, take 2.