You were close on the death scene improv speculation. It was actually Harrison Ford who did that. He did numerous takes fighting with his whip against the guy with the scimitar, and finally said “screw this”, took out his gun, and shot the guy.