Fix code layout and signatures

src/template/trace/TraceHooks.tt

@@ -325,12 +325,12 @@ $endif
 
 CollEq.traceContributionBegin [[
 $if (TraceColl)
-state().trace.contributionBegin(this, "#hostClassName.#signatureJavaStyle", "", "");
+state().trace().contributionBegin(this, "#collectionId");
 $endif
 ]]
 
 CollEq.traceContributionEnd [[
 $if (TraceColl)
-state().trace.contributionEnd(this, "#hostClassName.#signatureJavaStyle", "", "");
+state().trace().contributionEnd(this, "#collectionId");
 $endif
 ]]

src/template/trace/Tracer.tt

@@ -79,11 +79,11 @@ public static class Trace {
     FLUSH_ATTR,
     FLUSH_REWRITE,
     FLUSH_REWRITE_INIT,
-    INC_FLUSH_ATTR;
+    INC_FLUSH_ATTR,
 
     // Flag: --tracing=coll
     CONTRIBUTION_BEGIN,
-    CONTRIBUTION_END,
+    CONTRIBUTION_END;
   }
 
   /**
@@ -341,14 +341,14 @@ public static class Trace {
    * Trace that a contribution to a collection attribute begun.
    */
   public void contributionBegin($ASTNode node, String attr) {
-    receiver.accept($StateClass.Trace.Event.CONTRIBUTION_BEGIN, node, attr, "", value);
+    receiver.accept($StateClass.Trace.Event.CONTRIBUTION_BEGIN, node, attr, "", "");
   }
 
   /**
    * Trace that a contribution to a collection attribute ended.
    */
   public void contributionEnd($ASTNode node, String attr) {
-    receiver.accept($StateClass.Trace.Event.CONTRIBUTION_END, node, attr, "", value);
+    receiver.accept($StateClass.Trace.Event.CONTRIBUTION_END, node, attr, "", "");
   }
 }
 $endif