Moved the MPI C++ skip flags to the correct place.