Add clauses without id and rewrite functions in Clause2 to use them