Fixup: now compile with GCC 4.4.5