swift234

Some clean-up of box-to-stack promotion.

There were some simplifications a while ago that makes some of the code
unnecessary at this point. NFC.

Swift SVN r22530