Before leaving the storage room, he also grabbed a can of aerosol deodorizer.
I use baking soda/litter deodorizer and maybe that irritates him.
If you want scoopable litter with a tried, true and safe deodorizer and are concerned about dust and tracking, Arm and Hammer cat litter is likely a good choice for you.
The combination of vinegar and water is a natural cleanser and deodorizer, and it really works!
It is a cleaner and deodorizer at the same time, and it's called R-7 Ear Cleaning Deodorant Pads®.