Added 2-parameter calls to and_/or_