Well, I was rolling the Trek out the door, and the headlight fell on the floor. Seems the clamp broke. So, I ordered a new headlight.

I’m hoping the battery connectors will be interchangeable. It would be nice to be able to carry a spare battery.