If one of the "then" elements is a TensorType, and the corresponding
element in the "else" branch is a compatible type, or vice versa,
convert it into TensorType, so both have the same Type, and the
output Type can be determined.

This should fix a problem reported by Ian.
[Commit amended to fix problem spotted by Fred]