Fix a few C++ indent settings.