Improved options overriding for error-prone 'options_default'