Get rid of shadowed/unused variable/typedef gcc-8 warnings.

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

Another round sigh

Merge request reports