Clean up private method uniquifyNamesExp in Uniquify

This change cleans up the code a bit, as well as changes the style to
only copy when something has changed. It should reduce object
allocations somewhat during Uniquify.