Merge "More loop-body simplifications."
am: 3387b2a9e6

Change-Id: I8fcc63c86302a70842a7d185fe839bc316f5e25f