Fix compilation errors on gcc and clang due to last commit.