Use canonicalise-tree