Merge "Remove raw references to Map in XSQL"