Merge "Optimize xsql's use of collections"