Fixed bug in expand unique name generator

We were looking for _arg for a collision, but it isn't what we
actually use as a name, it's _arg[number].

Also wrapped source to 80 char, added tests that improve coverage