Index: /trunk/glueforge/templates/psdb/popobject.tt
===================================================================
--- /trunk/glueforge/templates/psdb/popobject.tt	(revision 4172)
+++ /trunk/glueforge/templates/psdb/popobject.tt	(revision 4173)
@@ -24,13 +24,14 @@
     }
 
-    object = psAlloc(sizeof([% object_name %]));
-
+    object = [% object_name %]Alloc(
+[%- SET i = 0 -%]
 [% FOREACH item = columns -%]
-[% IF item.type == "STR" -%]
-    object->[% item.name %] = psStringCopy([% item.name %]);
-[% ELSE -%]
-    object->[% item.name %] = [% item.name %];
-[% END -%]
-[% END -%]
+[% IF i == 0 -%][%- i = 1 -%][% ELSE %], [% END -%]
+[%- IF item.type == "STR" -%]
+psStringCopy([% item.name %])
+[%- ELSE -%]
+[% item.name %]
+[%- END -%]
+[% END -%]);
 
     return object;