Get rid of a spurious assert, call cm_cycle_end after zero length moves