Ast: Change EGoal -> EGoalDefn, ETactic -> ETacticDefn.