I've switched my EDC lights and bicycle lights to Eneloop AA and AAA for the same reason