Problem #1: With the teardrop switch in the "headlight on" position, the switch arm did not actually make contact with the terminal that goes to the headlight. I had to remove the switch and check the continuity of every switch position before I figured out this one.
Problem #2: The high/low beam switch did not work correctly. Switching on one direction worked correctly, but the other direction did not make the spring contact move correctly.
I fixed both problems with strategically placed blobs of solder.