More changes to string generation to make duplicate entry detection
easier.