Starting refactoring against 'wall' warnings