Re: Wasps
"I'm sanguine about swappable batteries..."
That may be you, but I've seen enough bulging batteries in the last five years to not trust them enough to leave them enclosed in a non-serviceable case. I consider them a fire risk so insist on them being removable.