Better tree URIs; avoid duplicating the tree ID.