Fix Issue 11425 - Broken shadowing variable diagnostic