swift234

Deal with tuple-to-scalar conversions a bit better.

Notice that I'm hacking the test to get it running again. I'd normally
feel bad about this, but since labeled tuple elements are going away,
the class of problems this commit is working around will disappear
entirely.


Swift SVN r11115