Simplify until_ by using unless