swift234

Maintain some more type sugar through substitution involving dependent types

... not because it's useful for the user, but because it props up our
broken model for computing generic types.

Swift SVN r20852