Clang fixes, part 1.