In line with other tools, this adds an extra wrapping block around such for loops to appropriately scope the variable.