Minimal changes for loop optimizations - No functional change