Really fix #1475 and #1445 this time.

The previous pull requests missed the fact that these strings were duplicated in code.