Fix shadowing
Merge pull request #4120 from yebblies/gagshadow

[DDMD] Fix shadowing