swift234

Fix some but not all of the errors that had been fixed by the reverted commit.

...and regress a few cases that were previously passing. On the whole I think it's
a win, though.

Swift SVN r30296