Remove cases of variable shadowing
Merge pull request #2219 from yebblies/shadow

[DDMD] Remove cases of variable shadowing