Changes to satisfy g++ 4.4