Fix new variable shadowing
Merge pull request #3308 from yebblies/shadowx

[DDMD] Fix new variable shadowing