swift234

Unify the generic and non-generic overloading paths.

While we're here, order conversion functions based on their return
type, because the input types are uninteresting and we want to convert
to the most specific type.


Swift SVN r9947