Now compiles with gcc 4.8.x.