Continuing efforts to get it to compile in gcc.