Warning-safe code

* Remove "variable shadowing"
* Fix "ambiguous first argument; put parentheses or even spaces"