g++-4.7 compatibility fixes.