More WIP on trees. Still battling spurious self-intersections.