last cleanup

I was annoyed by the duplication of code for the `$I_MPI_FC` case...