Yeah if you want to save yourself headaches, the simplest way would be to get a light that uses 3 C or D batteries and replace it with a single 18650 or 26650.
With a 4 cell light, you’ll end up either lower or higher than the intended voltage although it’s possible you may be within the voltage range tolerance.