Get rid of unused/shadowed variable compiler warnings.

Markus Blattrequested to merge
features/shut-up-compiler-warnings into master

Merge request reports