Fix shadowed variables, format #2596

Job	Run time
Linting	25m 10s
Quick Checks	10s
ubuntu-22.04 / gcc / Debug	8m 24s
Documentation	12m 9s
ubuntu-22.04 / gcc / RelWithDebInfo	15m 32s
windows-2022 / Debug	21m 17s
ubuntu-20.04 / clang / Debug	5m 14s
windows-2022 / RelWithDebInfo	19m 58s
ubuntu-20.04 / clang / RelWithDebInfo	13m 37s
macos-15 / clang / Debug	3m 12s
macos-15 / clang / RelWithDebInfo	3m 12s
	2h 7m 55s

Provide feedback