Convert to new non-enum options.