diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index eea1738..cb41888 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -1961,14 +1961,17 @@
 static Frag_T st_pop __ARGS((Frag_T **p, Frag_T *stack));
 
 /*
- * Initialize Frag_T struct.
+ * Initialize a Frag_T struct and return it.
  */
     static Frag_T
 frag(start, out)
     nfa_state_T	*start;
     Ptrlist	*out;
 {
-    Frag_T n = { start, out };
+    Frag_T n;
+
+    n.start = start;
+    n.out = out;
     return n;
 }
 
@@ -2144,7 +2147,7 @@
     if (postfix == NULL)
 	return NULL;
 
-#define PUSH(s)	    st_push ((s), &stackp, stack_end)
+#define PUSH(s)	    st_push((s), &stackp, stack_end)
 #define POP()	    st_pop(&stackp, stack);		\
 		    if (stackp < stack)			\
 		    {					\