Don't know without having a proper play, John.
I'd say spring first. Then, if that didn't work, maybe borrow a trigger unit from another gun and see if that helps.
Of course, Mel could always just omit the safety catch anyway and job done, but I think he prefers it back to how it should be?