Cope with changes to ssw_axis_model (upstream)