Get rid unused/shadowed variable compiler warnings.

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

Eases life of downstream developers that are fond of using warnings to find faulty code.

Merge request reports