Make it work under g++-4.7 too (g++-4.6 was fine)