Here's the solution I used on my last build:
Granted, the pin doesn't just pop out any longer, but the upper sure is kept tight to the lower.
NRA Chief Range Safety Officer, Home Firearms Safety, Pistol and Rifle Instructor
"There are three classes of people: those who see, those who see when they are shown, those who do not see."
Leonardo da Vinci