Attempting a compilation fix for gcc / clang.