Another diff update. Improved subtree diff.