I found that apart from the carbon and that switch, one of the brush springs had lost its springiness! Un-compressing the spring and reassembling fixed the little bastard, but probably a replacement job in the near future.
Be very careful pulling off the circuit board under the cap as the...