Handle `until` with no body in `Next`

@bbatsov