By the way, here is some info for whoever may be interested:
If you would like to know if a flashlight body would accept a 17670 or an 18650, and you don't have one of the batteries present, here is a simple way to do it...
17670
To check for the 17670 battery, simply roll the END of a single dollar bill around a CR123 from TOP TO BOTTOM of the bill. The bill will wrap around the CR123 about one and a fourth times. The result is the diameter of the 17670.
18650
Simply put three dollar bills together like you would in a wallet. Then take a CR123 battery and roll the stack of bills around the CR123 from one end of the stack to the other. What you end up with is a roll about the same diameter as an 18650. Chances are if the roll fits in the body, an 18650 will also.