solved some merging-regressions. sorry.
Remove some '-Wshadow' warnings