Prevent clashing short arguments

If there are going to be clashing short arguments then only register the
first one.

Change-Id: I9aaef72f0c9f3714f18f52fb08c14e37e518762d
Merge "Prevent clashing short arguments"