More refactoring of OptionShouldContainSpec: pulled out a OptionShouldContainOneOfSpec.