Well, I was so pleased with the dimmer, I tackled the headlight switch..
The tabs are smaller so a very small standard screwdriver did the initial bends..
Parts are more or less in order here and oriented correctly

You can see the corroded terminals

cleaned...

Lubed and re-assembled...It's smooth and it works!
