Efficiency Update

Now merges trees for a composite analysis, rather than re-parsing
everything.