--- a/src/core/model/make-event.h	Thu Jul 16 11:36:33 2015 -0400
+++ b/src/core/model/make-event.h	Mon Jul 20 15:53:03 2015 -0400
@@ -418,7 +418,8 @@
     }
     static EventImpl* Clone (void)
     {
-      return new EventMemberImpl0 ();
+      EventImpl *p = new EventMemberImpl0 ();
+      return p;
     }
     virtual size_t SerialSize (void)
     {
@@ -465,7 +466,8 @@
     }
     static EventImpl* Clone (void)
     {
-      return new EventMemberImpl1 ();
+      EventImpl *p = new EventMemberImpl1 ();
+      return p;
     }
     virtual size_t SerialSize (void)
     {
@@ -518,7 +520,8 @@
     }
     static EventImpl* Clone (void)
     {
-      return new EventMemberImpl2 ();
+      EventImpl *p = new EventMemberImpl2 ();
+      return p;
     }
     virtual size_t SerialSize (void)
     {
@@ -574,7 +577,8 @@
     }
     static EventImpl* Clone (void)
     {
-      return new EventMemberImpl3 ();
+      EventImpl *p = new EventMemberImpl3 ();
+      return p;
     }
     virtual size_t SerialSize (void)
     {
@@ -633,7 +637,8 @@
     }
     static EventImpl* Clone (void)
     {
-      return new EventMemberImpl4 ();
+      EventImpl *p = new EventMemberImpl4 ();
+      return p;
     }
     virtual size_t SerialSize (void)
     {
@@ -696,7 +701,8 @@
     }
     static EventImpl* Clone (void)
     {
-      return new EventMemberImpl5 ();
+      EventImpl *p = new EventMemberImpl5 ();
+      return p;
     }
     virtual size_t SerialSize (void)
     {
@@ -711,7 +717,8 @@
     virtual void Serialize (char *out, ClonerType &fp)
     {
       internal::SerialHelper sh (out);
-      sh.Serialize (m_obj).Serialize (m_function).Serialize (m_a1).Serialize (m_a2).Serialize (m_a3).Serialize (m_a4).Serialize (m_a5);
+      sh.Serialize (m_obj).Serialize (m_function).Serialize (m_a1).Serialize (m_a2).Serialize (m_a3).Serialize (m_a4).Serialize (m_a5
+                                                                                                                                 );
       fp = &EventMemberImpl5::Clone;
     }
     virtual void Deserialize (char *in)
@@ -756,7 +763,8 @@
     }
     static EventImpl* Clone (void)
     {
-      return new EventFunctionImpl1 ();
+      EventImpl *p = new EventFunctionImpl1 ();
+      return p;
     }
     virtual size_t SerialSize (void)
     {
@@ -771,8 +779,8 @@
     }
     virtual void Deserialize (char *in)
     {
-      internal::SerialHelper sh (in);
-      sh.Deserialize (m_function).Deserialize (m_a1);
+       internal::SerialHelper sh (in);
+        sh.Deserialize (m_function).Deserialize (m_a1);
     }
 protected:
     virtual ~EventFunctionImpl1 ()
@@ -807,7 +815,8 @@
     }
     static EventImpl* Clone (void)
     {
-      return new EventFunctionImpl2 ();
+      EventImpl *p = new EventFunctionImpl2 ();
+      return p;
     }
     virtual size_t SerialSize (void)
     {
@@ -862,7 +871,8 @@
     }
     static EventImpl* Clone (void)
     {
-      return new EventFunctionImpl3 ();
+      EventImpl *p = new EventFunctionImpl3 ();
+      return p;
     }
     virtual size_t SerialSize (void)
     {
@@ -920,7 +930,8 @@
     }
     static EventImpl* Clone (void)
     {
-      return new EventFunctionImpl4 ();
+      EventImpl *p = new EventFunctionImpl4 ();
+      return p;
     }
     virtual size_t SerialSize (void)
     {
@@ -981,7 +992,8 @@
     }
     static EventImpl* Clone (void)
     {
-      return new EventFunctionImpl5 ();
+      EventImpl *p = new EventFunctionImpl5 ();
+      return p;
     }
     virtual size_t SerialSize (void)
     {