Fixing shadow variable warnings.