Merge "fix the build.  more string disambiguaiton."