Make xid be a uint32_t and not either unsigned long or unsigned int