swift234

Make diagnostic text consistent between the old and new compiler.

...picking whichever I feel is superior.

Swift SVN r13188