Allowing for overlapping MPI library builds; plus cleanup.