remove 'one_line_conditional' remnants from lexer