I have had good luck getting leaf switches back in working order simply by cleaning and adjusting.
A little rubbing alcohol on a swab, and use the trick of rubbing a cardboard business card in between the contacts while squeezing the switch closed gently.