New g++ this-> fixes