Add margin options to OptionSet.