Remove XID wrapper structures and replace them with uint32_t typedefs