Simplify generated API for collections in XmlProvider (closes #686)