Work around compilation warnings with gcc 4.9.1 after ae1ee8bf80