Allow nested "and, or, not" & add remove repeated arg