Merge pull request #3953 from mikeller/remove_duplicate_str_helper