Not necessarily one size/shape, but a narrow range of open standard sizes, a bit like the modern mobile equivalent of AA / AAA / C / D batteries.
An added advantage of this would be a good market for third party companies like duracell etc to make reliable replacement batteries, instead of having to rely on some knock-off from ebay which may explode.