Issue #19299 Switch to XM.SimpleModel for all datasource models.