More -Weffc++ cleanup, almost done