More improvements to the tree-drawing code.