Technology may save the day. Personally I use sound-isolating headphones and FM radio or online music, as well as so many programmers (so I do not care if anybody sees it as passive aggressive). I'd say let bygones be bygones. Guy might be offended, forget, ignore your comment or just be incapable to stay quiet. Note that good ones cost $$$, and frugal person, like me, might end paying twice. Yet I see it as a fair price for the comfort. A drawback of headphones is that you might miss a manager sneaking behind, and seeing you complaining on work condition in social media, so will have to stop it.
I have seen people who use earplugs, yet I never dared something so radical myself, being afraid to look uncool / passive-aggressive so cannot comment how efficient are those
Some innovative and sometimes non-orthodox noise reduction ideas are floating around. One of startups, HushMe fights noise at the source with a special mask. It, regretfully, only reduces noise about 50%. Still, if you want make a joke just say want to see something funny gadget, yet the solution is a bit premature, headphones or telling straight might be safer bet. But let's not give up hope for improved technologies.
UPDATE. Just found potentially cheaper solution: create noise yourself, preferably white one, to hum the unpleasant co-worker noises. White noise devices or apps are quite inexpensive. I found this solution at a list of noise reduction solutions at https://snapcab.com/pods/escaping-the-noise-of-open-workspaces. ( I am not affiliated with any producers of dividers, white noise, or snapcab webmaster, swear) . Possible drawback - white noise is know to induce sleep, not sure is there such thing as upbeat white noise. Some doctors are worried that true white noise might be harmful, up to cause premature brain aging due to lack of structure https://gizmodo.com/study-claims-white-noise-can-damage-your-brain-but-don-1828804061. You get what you are paying a milder noise, such as pink one might be a better solution.