[DDMD] Remove cases of variable shadowing