[MOD] XQuery: rewrite count(map:keys($map)) to map:size($map)
[MIN] XQuery, refactorings