rename two identical variables to same name and remove guard
Merge pull request #2881 from jw2013/string

rename two identical variables to same name and remove guard