Changed existing methods with names like inOrderOnly to oldInOrderOnly. Commented
out tests that broke.
More changing of names like inOrderOnly to oldInOrderOnly.
Changed newOneOf and kin to oneOf, etc. Still using both contain and newContain, but now
oneOf is the new one, oldOneOf is the old one. Next job is to get rid of newContain.