Prepare a branch for gcc-4.4 compatibility