g++ 4.2 didn't like my last change.