[CLEANUP] Inline more loop variables.