Adapt to OCaml trunk. Bring in the Ast_convenience module (previously in Ast_helper).