Sounds like a good opportunity to correct the multitude of bullet connectors Crowbar. Interesting that later Trad Morgan's used the Lucas compliant blue/yellow wiring code for fog lights.
BTW I'm reminded of this Douglas Adams (Hitchhiker's guide to the Galaxy) quote:
A common mistake some people make when designing something completely foolproof is in underestimating the ingenuity of complete fools.