Remove unnecessary parameter from inherited_options_for
Stop mutating build options in upgrade