Disambiguate common strings: Bug #736632