Clean up some Clang warnings.