Don't replace defaults with _options

Don't replace defaults with _options, just copy over changed values.