4th attempt to fix build errors on GCC.