Update for gcc-4.9 development.