do_and|or_form() modified