One would hope, however, that when the apparently indivisible (to a
layperson) unit is indeed composed of several sub-units (and by this I
mean
car batteries, 9V batteries, etc.) we might at least in this instance
continue to refer to the sub-units as cells and not batteries within
batteries!

That was pretty much my point. I don't take issue with D-cells being
called batteries.