Remove duplicate nodes from xf:extract
Reformatting
Rename xform.xq to core.xq, modify namespace