Remove `BitMaskOption` and `BitMaskOptionSet` and replace with `OptionSet`.
Remove
BitMaskOptionandBitMaskOptionSetand replace withOptionSet.