Make CLP.Tree use macros consistent with CLP.FD, better organise clp_tree.ex