Merge OptionSet and Option; make op+ free against downcasts.