Adding (until?) and (take-until)