Get rid of a -Wshadow warning

(and related cosmetic changes)
Get rid of one more -Wshadow warning.