True,and I have a chit load of 18650's myself. I have also picked up a few 21700 devices and now have plenty of 2x series Batts on hand now.
That is why I think they should change over,you can still run your 18650's if you so choose,but also able to run a better battery.