EU mandate for removable batteries will restore lost flexibility.
Even repair/replace is improving, with new aftermarket storage upgrades for Macbooks.