New schema combiner, OneOf

Exactly like Enum, but with one less level of nesting.
More tests