XARRAY option for structs + changed enum typedef.