Fix warnings

This fixes some harmless but annoying warnings. Don't hesitate complaining about cosmetics or whatnot, I'll make any changes requested.

- first commit is to avoid using local variables or method parameters that conflict with member functions
- second is marking static functions as such.