Improve untilFinished syntax.