They died again today - folding in then right back out again. Popped off both covers and found micro-switch on passengers side had popped out of holder - just like the last time they failed (a couple of years ago).
I used holt-melt glue on both switches to keep them in place. You need to place the glue carefully and cut it back with a sharp knife (X-Acto #11) to ensure the glue doesn't interfere with the switch fitment.
Added some lube to the contact point too. All working again.