And fix indexing when at that - the inserting is 1-based, so let's be
consistent in the .uno:Name and .uno:Remove too.

Change-Id: Ib854e81551ae0a39d3ba7c68512e81ea227e9eb1