refactor: Remove redundant definitions
These were identified via -Wshadow in #29485, see the commit messages
for the associated compiler message.
These were identified via -Wshadow in #29485, see the commit messages
for the associated compiler message.