Messy changes (some need to be reverted) to get SMR w/o MPI working