Fix warnings about shadowing introduced in D2047

Summary: As per title. Relates to D2047

Test Plan:

make check

See if there are still warnings

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Subscribers: teamcity

Differential Revision: https://reviews.bitcoinabc.org/D2065