Rework handling of fw/vehicle type with respect to conflicts with actual vehicle types.