Resolve shadowing parameters/variables

There are many parts of the code, which if `-Wshadow` is enabled, will indicate that parameters are shadowing (taking the same name as) existing variables. This can be highly confusing and generally not necessary, and it should be possible to resolve at least most of these variable naming issues.