Thanks for the response. I figured I could make something work by modifying a different Li+ cell, but it's not really worth the trouble to me just to rescue a light I could replace for ~$20. Was hoping someone might have a source for a drop-in replacement.