scalar replacement of arrays affected by minor changes to surrounding code

[Roland Westrelin]

Hi Charlie,

> Roland is there anything I could do to help get this type of change into tip and any
> appropriate back ports? I have tested some workloads with this patch and I think
> I covered the required checks but I could have easily missed something.

Let me go over the patch again and prepare it for review.

Roland.