The M16 extractor is probably the way to go. Sako style can be blown out of the bolt. If you blow the Sako extractor on a Barnard (actually hard to do with the small pin) often you can't open the bolt without unscrewing the barrel (the only fault I am aware of on the Barnard) and this can bugger your day. I have had 700 bolts opened up and M16 installed, I did not do it but jobbed it out to a qualified friend, a master machinist and rifle builder. The barrel needs to be a bit larger where the bolt nose goes in because the extractor goes outside the bolt nose when it goes over the rim.