convert until statements to if (!...)