Moving (e)transitivity out of the AST.