Theory of Finite or Infinite Trees Revisited