Tentative fix for gcc-4.7 and earlier failures.