Make GCC 4.0 happy again