Preparing for making MPI optional