Temporary checkin with minor improvements to iterative code