More Clang-related bugfixes.