cleanup: fix quantification in eval definition (cosmetic effect only)
Implement WaitUntil.