CAROLINE-30: Fix singleton compilation on gcc.