Issue #19299 Switch some back to XM.Model. Needs more work.