Rather large refactor that gets "should contain oneOf" and its kin to use the
new stuff, as well as "should not contain newOneOf", as an intermediate step.