swift234

Change typeCheckCondition and solveForExpression to stop using 
setConversionType along with the constraints they install.  The constraints
should be enough by themselves, and CSDiags shouldn't need them to
bias the solution.

Of course, the constraints weren't enough, so improve CSDiags so that it can
do the right thing without them.



Swift SVN r30636