More -Weffc++ cleanup