ForEachExpand: Name arguments at the time the ForEachStub is created

This also removes code duplication.

No functional change intended.

Change-Id: Ie01d0578a70219909cac3c77e3b184589c371845
1 file changed