More clang cleanups