I use contact cleaner at work too, the MAF cleaner smells different to the contact cleaner, sort of like contact cleaner mixed with petrol.

For serious dissolving power we use Electrolube FLU fluxclene (sp?) it smells like citrus and instantly dissolves soldering flux residue and gum from sticky labels.
For switches & connectors I would recommend Deoxit D5, it does not evaporate off like the contact cleaner it is oily, sort of like very expensive WD40. It is made for professional audio engineers, it works very well.
These products are expensive compared to WD40 or contact cleaner but if you want to do the job, you should get the right cleaner.
There is a non flammable contact cleaner available, tried it once, it damages plastics & does not work as well as the standard stuff, would never use it again.