Factor arborist out of ast
Rename ast -> tree