Rename variables and rearrange code to please gcc -Wshadow checks