Weffc++, g++ fix.