Improved temp var name uniquing