There was a whole habitat behind the dash - included a few mud-dobber houses, a mouse condo, and other unidentified mud-balls. Yuck.
As part of removing the extra solenoid and cleaning up the electrical system, I purchased a new key switch.
Out with the old...
In with the new:
I switched the leads one at a time to keep them on the right posts. A 7mm socket was the ticket to easily remove each bolt and I scruffed each contact with 220 grit sand paper to remove any corrosion.