Moved the and/or DSL extension from GenericOps to BooleanOps
Added a whole slew of tests, including ones that prove #23 to be a DSL issue (believed to be derived from #22, but that remains to be seen).