Made it work with gcc 4.6, too.