One interesting solution I saw was batteries which stick a lithium battery + charge controller / voltage adapter inside the AA package so they can be used on any device.