Fix typenames for gcc.