Various cleanups in some C++ files.