Lescoulee, I tried that. That spring loaded tooth is under the block on the left side of the action in my picture #6. Even if I retract that tooth (I don't know the term for it), the bolt will not rotate.
I'm afraid I'm in a situtation where I can't reassemble the safety properly since I can't remove the bolt. And I can't remove the bolt because the safety is assemble incorrectly. Catch 22.
I've gonna break it down again later and take a fresh look at it.