Okay, got the pesky safety back in the intermediate position, and removed the striker assembly from the bolt.

Now I just have to remove the three position shroud/safety assembly, and replace with the pre-war assembly.