Clang fixes. Trying default clang.