Well, I posted a lengthy reply but I see it's gone, now. So, here goes again.
There should be some extraneous wires somewhere along the circuit, probably from the bulkhead forward to the headlights. But the first place I would look, agreeing with GTRS, is at the back of the switch to see if there are any jumper wires in the back of the harness plug.
As for the headlight module, when I converted my 86 to the Generation 2 system, I jacked up the car and put it on stands. Then from underneath, I believe I reached up from below to plug in the module. It's possible that I removed the wheel and fender well liner during the module install, but I don't remember having done that.