Apply the CForLoop name hiding fix to this branch