Remove outer variable shadowing within the block