Fix build w/o MPI, minor cleanup

Change-Id: Ifda10dd9ebbef34a22d84dd040215d451baa7896