Remove some shadowed variables
3 files changed