Minor refactorization.
Some more moving thing saround.
Suppressing some warnings.

... and adding TODOs for later removing unused members