Implement stateful surpasses() for until()

Implement stateful surpasses() for until() #21588