Revert "Revert "MachineScheduler: better book-keeping for asserts.""