Separating into tree-making and plot-making parts; big speedup.