Update to work-in-progress version, incorporating recent no-mpi changes.