meh if replacing a battery is a once every two year operation that you can pay a shop $2-40 + $10 of battery cost to do it in 30 minutes depending on the cost of labor where you are, is it really that big of a deal?
Key word is repairability here, not necessarily user swapable. You can go buy chunky construction worker edition if you want all the swapabillity if you want to.
I wish people stopped buying phones with non-removable battery. I sure as hell will not buy a phone if I cannot replace its battery. On the other hand, I think it makes the device thinner, and weighs less, so some people prefers that over being able to replace the battery. Not sure what to do here than to accept their preference.