swift234

Another small clean-up. Manually copy-forward a value.

We know one value can be substituted for another after a given point, so
instead of conditional assignment, just substitute it.

Swift SVN r25942