Fix all clang warnings.
Merge with master.