swift234

Eliminate another case where we were performing substitutions via archetypes.

Interface types are better. Use them.

Swift SVN r25394