Further Clang compatibility fixes.