"“A portable battery should be considered to be removable by the end-user when it can be removed with the use of commercially available tools”"

Additionally, the manufacturer should make batteries available for SEVEN years after release.

A step in the right direction, IMO. Now mandate software support for that duration.