"Lethal Weapon 2" - The Diplomatic Immunity Thing STILL Bugs Me!

Okay, so we just finished watching Lethal Weapon 2 and, I gotta say, it's still a blast. Riggs is completely off-the-rails (in a good way? mostly?) and Murtaugh's reactions are priceless. But seriously, does anyone else find the whole 'diplomatic immunity' plot a little convenient? Like, were South African diplomats in the 80s really this brazen? I know it's a movie, but it felt like a pretty big leap, even for a buddy cop flick. And speaking of leaps, that scene where Riggs jumps off the building onto the car?! Still gives me anxiety! Poor Patsy Kensit, though. She was good, but kinda felt like she was just there to die and give Riggs some angst. Thoughts on that? Was she necessary to the plot, or could they have just ramped-up Riggs' usual crazy without her? Also, I know it's a small thing, but did anyone else find the 'Krugerrand' thing a bit repetitive? Like, we get it, they're smuggling gold. Maybe they could have found a slightly more creative way to hammer that point home? I did LOL when they blew up Murtaugh's toilet tho. Classic. Overall, I enjoyed it! But I'm just sayin', the plot details haven't exactly aged like fine wine. What do you guys think? Was I overthinking it, or were some elements a bit...rough?