Deal with tuple-to-scalar conversions a bit better.
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

khizkhiz/swift,swiftix/swift.old,kperryua/swift,IngmarStein/swift,khizkhiz/swift,milseman/swift,huonw/swift,uasys/swift,xwu/swift,xwu/swift,mightydeveloper/swift,lorentey/swift,danielmartin/swift,stephentyrone/swift,gottesmm/swift,natecook1000/swift,gribozavr/swift,amraboelela/swift,jopamer/swift,stephentyrone/swift,natecook1000/swift,felix91gr/swift,mightydeveloper/swift,CodaFi/swift,gribozavr/swift,dduan/swift,SwiftAndroid/swift,austinzheng/swift,IngmarStein/swift,danielmartin/swift,gregomni/swift,sdulal/swift,return/swift,therealbnut/swift,khizkhiz/swift,ben-ng/swift,nathawes/swift,SwiftAndroid/swift,kentya6/swift,modocache/swift,kusl/swift,jmgc/swift,harlanhaskins/swift,arvedviehweger/swift,deyton/swift,amraboelela/swift,amraboelela/swift,devincoughlin/swift,ken0nek/swift,swiftix/swift,tardieu/swift,practicalswift/swift,jckarter/swift,hooman/swift,manavgabhawala/swift,roambotics/swift,kusl/swift,LeoShimonaka/swift,IngmarStein/swift,sschiau/swift,ken0nek/swift,swiftix/swift.old,frootloops/swift,gottesmm/swift,xedin/swift,mightydeveloper/swift,huonw/swift,swiftix/swift,shajrawi/swift,dduan/swift,zisko/swift,slavapestov/swift,deyton/swift,gmilos/swift,jckarter/swift,shahmishal/swift,tkremenek/swift,frootloops/swift,rudkx/swift,airspeedswift/swift,shajrawi/swift,parkera/swift,felix91gr/swift,jmgc/swift,ken0nek/swift,alblue/swift,zisko/swift,apple/swift,milseman/swift,JGiola/swift,shajrawi/swift,Ivacker/swift,adrfer/swift,stephentyrone/swift,natecook1000/swift,parkera/swift,airspeedswift/swift,allevato/swift,jtbandes/swift,kperryua/swift,frootloops/swift,calebd/swift,JGiola/swift,apple/swift,xedin/swift,rudkx/swift,manavgabhawala/swift,return/swift,tkremenek/swift,kentya6/swift,shahmishal/swift,felix91gr/swift,xwu/swift,MukeshKumarS/Swift,apple/swift,airspeedswift/swift,ahoppen/swift,johnno1962d/swift,hooman/swift,sdulal/swift,kentya6/swift,roambotics/swift,swiftix/swift.old,austinzheng/swift,return/swift,JaSpa/swift,tkremenek/swift,manavgabhawala/swift,MukeshKumarS/Swift,lorentey/swift,devincoughlin/swift,emilstahl/swift,jopamer/swift,kusl/swift,calebd/swift,rudkx/swift,xedin/swift,aschwaighofer/swift,gregomni/swift,MukeshKumarS/Swift,JGiola/swift,arvedviehweger/swift,MukeshKumarS/Swift,atrick/swift,ben-ng/swift,gottesmm/swift,hooman/swift,jtbandes/swift,allevato/swift,apple/swift,kentya6/swift,deyton/swift,jmgc/swift,atrick/swift,gmilos/swift,benlangmuir/swift,IngmarStein/swift,KrishMunot/swift,dduan/swift,ben-ng/swift,austinzheng/swift,austinzheng/swift,IngmarStein/swift,OscarSwanros/swift,MukeshKumarS/Swift,return/swift,OscarSwanros/swift,tkremenek/swift,allevato/swift,arvedviehweger/swift,karwa/swift,kperryua/swift,shahmishal/swift,LeoShimonaka/swift,gmilos/swift,tkremenek/swift,parkera/swift,atrick/swift,alblue/swift,airspeedswift/swift,uasys/swift,amraboelela/swift,gregomni/swift,bitjammer/swift,calebd/swift,kperryua/swift,johnno1962d/swift,karwa/swift,therealbnut/swift,kusl/swift,CodaFi/swift,Ivacker/swift,gribozavr/swift,shahmishal/swift,codestergit/swift,JaSpa/swift,rudkx/swift,brentdax/swift,kstaring/swift,tjw/swift,harlanhaskins/swift,brentdax/swift,gribozavr/swift,jopamer/swift,tinysun212/swift-windows,karwa/swift,harlanhaskins/swift,dreamsxin/swift,lorentey/swift,bitjammer/swift,CodaFi/swift,cbrentharris/swift,shajrawi/swift,shahmishal/swift,ahoppen/swift,KrishMunot/swift,tinysun212/swift-windows,SwiftAndroid/swift,OscarSwanros/swift,kusl/swift,danielmartin/swift,ken0nek/swift,codestergit/swift,stephentyrone/swift,zisko/swift,nathawes/swift,shahmishal/swift,adrfer/swift,djwbrown/swift,mightydeveloper/swift,tinysun212/swift-windows,johnno1962d/swift,modocache/swift,kstaring/swift,jmgc/swift,ahoppen/swift,jopamer/swift,djwbrown/swift,kentya6/swift,danielmartin/swift,slavapestov/swift,gribozavr/swift,KrishMunot/swift,emilstahl/swift,slavapestov/swift,alblue/swift,tjw/swift,hughbe/swift,devincoughlin/swift,huonw/swift,jtbandes/swift,parkera/swift,modocache/swift,stephentyrone/swift,djwbrown/swift,JaSpa/swift,mightydeveloper/swift,bitjammer/swift,return/swift,russbishop/swift,OscarSwanros/swift,johnno1962d/swift,return/swift,JGiola/swift,jopamer/swift,hughbe/swift,sdulal/swift,austinzheng/swift,practicalswift/swift,russbishop/swift,jopamer/swift,djwbrown/swift,manavgabhawala/swift,harlanhaskins/swift,CodaFi/swift,OscarSwanros/swift,harlanhaskins/swift,jmgc/swift,nathawes/swift,benlangmuir/swift,gmilos/swift,sdulal/swift,modocache/swift,natecook1000/swift,therealbnut/swift,glessard/swift,felix91gr/swift,arvedviehweger/swift,aschwaighofer/swift,shahmishal/swift,alblue/swift,khizkhiz/swift,sschiau/swift,danielmartin/swift,johnno1962d/swift,arvedviehweger/swift,tardieu/swift,cbrentharris/swift,ben-ng/swift,swiftix/swift,CodaFi/swift,uasys/swift,parkera/swift,Ivacker/swift,roambotics/swift,swiftix/swift.old,uasys/swift,JaSpa/swift,harlanhaskins/swift,felix91gr/swift,manavgabhawala/swift,jckarter/swift,airspeedswift/swift,russbishop/swift,djwbrown/swift,hooman/swift,atrick/swift,Jnosh/swift,amraboelela/swift,xedin/swift,nathawes/swift,LeoShimonaka/swift,apple/swift,jckarter/swift,tkremenek/swift,parkera/swift,hughbe/swift,LeoShimonaka/swift,devincoughlin/swift,aschwaighofer/swift,allevato/swift,austinzheng/swift,lorentey/swift,jmgc/swift,zisko/swift,jmgc/swift,zisko/swift,swiftix/swift.old,cbrentharris/swift,Ivacker/swift,Ivacker/swift,SwiftAndroid/swift,brentdax/swift,felix91gr/swift,tjw/swift,gmilos/swift,modocache/swift,swiftix/swift,karwa/swift,djwbrown/swift,sschiau/swift,tjw/swift,kentya6/swift,gmilos/swift,gmilos/swift,gribozavr/swift,Jnosh/swift,Ivacker/swift,zisko/swift,emilstahl/swift,aschwaighofer/swift,nathawes/swift,tinysun212/swift-windows,atrick/swift,gregomni/swift,swiftix/swift.old,dduan/swift,Jnosh/swift,jckarter/swift,huonw/swift,gottesmm/swift,deyton/swift,shajrawi/swift,brentdax/swift,nathawes/swift,therealbnut/swift,brentdax/swift,ahoppen/swift,russbishop/swift,sdulal/swift,johnno1962d/swift,JGiola/swift,milseman/swift,tardieu/swift,modocache/swift,calebd/swift,apple/swift,adrfer/swift,jckarter/swift,slavapestov/swift,OscarSwanros/swift,karwa/swift,practicalswift/swift,ben-ng/swift,codestergit/swift,JGiola/swift,natecook1000/swift,hooman/swift,kstaring/swift,kperryua/swift,roambotics/swift,LeoShimonaka/swift,bitjammer/swift,tardieu/swift,rudkx/swift,CodaFi/swift,kperryua/swift,allevato/swift,KrishMunot/swift,dduan/swift,OscarSwanros/swift,modocache/swift,stephentyrone/swift,therealbnut/swift,jtbandes/swift,swiftix/swift,JaSpa/swift,SwiftAndroid/swift,frootloops/swift,jtbandes/swift,cbrentharris/swift,alblue/swift,manavgabhawala/swift,practicalswift/swift,practicalswift/swift,lorentey/swift,LeoShimonaka/swift,bitjammer/swift,gregomni/swift,milseman/swift,milseman/swift,ben-ng/swift,tjw/swift,russbishop/swift,dduan/swift,sdulal/swift,sschiau/swift,MukeshKumarS/Swift,kstaring/swift,xwu/swift,KrishMunot/swift,karwa/swift,kstaring/swift,tinysun212/swift-windows,Jnosh/swift,tinysun212/swift-windows,sschiau/swift,kusl/swift,Jnosh/swift,adrfer/swift,alblue/swift,codestergit/swift,therealbnut/swift,aschwaighofer/swift,emilstahl/swift,khizkhiz/swift,gottesmm/swift,ken0nek/swift,sschiau/swift,lorentey/swift,aschwaighofer/swift,rudkx/swift,LeoShimonaka/swift,swiftix/swift.old,adrfer/swift,kentya6/swift,cbrentharris/swift,hughbe/swift,jckarter/swift,shahmishal/swift,karwa/swift,swiftix/swift.old,kperryua/swift,benlangmuir/swift,codestergit/swift,mightydeveloper/swift,ken0nek/swift,hooman/swift,karwa/swift,codestergit/swift,allevato/swift,adrfer/swift,xwu/swift,xedin/swift,tardieu/swift,jtbandes/swift,swiftix/swift,ahoppen/swift,shajrawi/swift,hughbe/swift,russbishop/swift,glessard/swift,jopamer/swift,deyton/swift,lorentey/swift,khizkhiz/swift,JaSpa/swift,mightydeveloper/swift,calebd/swift,SwiftAndroid/swift,emilstahl/swift,MukeshKumarS/Swift,allevato/swift,zisko/swift,natecook1000/swift,airspeedswift/swift,danielmartin/swift,xedin/swift,manavgabhawala/swift,huonw/swift,felix91gr/swift,calebd/swift,uasys/swift,cbrentharris/swift,parkera/swift,hughbe/swift,slavapestov/swift,LeoShimonaka/swift,hughbe/swift,stephentyrone/swift,jtbandes/swift,brentdax/swift,return/swift,calebd/swift,dreamsxin/swift,devincoughlin/swift,huonw/swift,cbrentharris/swift,atrick/swift,milseman/swift,slavapestov/swift,johnno1962d/swift,aschwaighofer/swift,tardieu/swift,codestergit/swift,gribozavr/swift,bitjammer/swift,kstaring/swift,kstaring/swift,harlanhaskins/swift,natecook1000/swift,frootloops/swift,deyton/swift,sschiau/swift,shajrawi/swift,amraboelela/swift,devincoughlin/swift,Jnosh/swift,xedin/swift,sdulal/swift,roambotics/swift,Ivacker/swift,xwu/swift,CodaFi/swift,djwbrown/swift,austinzheng/swift,gregomni/swift,IngmarStein/swift,frootloops/swift,nathawes/swift,glessard/swift,dduan/swift,mightydeveloper/swift,devincoughlin/swift,JaSpa/swift,gottesmm/swift,deyton/swift,glessard/swift,slavapestov/swift,therealbnut/swift,kusl/swift,ben-ng/swift,tjw/swift,emilstahl/swift,cbrentharris/swift,benlangmuir/swift,sschiau/swift,kentya6/swift,lorentey/swift,alblue/swift,Jnosh/swift,tardieu/swift,swiftix/swift,khizkhiz/swift,kusl/swift,KrishMunot/swift,benlangmuir/swift,huonw/swift,parkera/swift,sdulal/swift,xedin/swift,russbishop/swift,glessard/swift,practicalswift/swift,SwiftAndroid/swift,uasys/swift,arvedviehweger/swift,emilstahl/swift,emilstahl/swift,amraboelela/swift,practicalswift/swift,airspeedswift/swift,danielmartin/swift,tinysun212/swift-windows,ken0nek/swift,shajrawi/swift,xwu/swift,hooman/swift,IngmarStein/swift,glessard/swift,gottesmm/swift,adrfer/swift,practicalswift/swift,devincoughlin/swift,milseman/swift,benlangmuir/swift,frootloops/swift,KrishMunot/swift,brentdax/swift,Ivacker/swift,bitjammer/swift,gribozavr/swift,arvedviehweger/swift,tjw/swift,tkremenek/swift,roambotics/swift,uasys/swift,ahoppen/swift