Cleaning up some clang warnings and code.