Re #10836 Refactored RestoreParamFromInstrument
Re #10838 fixed old approach to update_defaults_from_instrument

but it is still too complicated