diff --git a/include/product.h b/include/product.h
index 1e296731..c6326ac5 100644
--- a/include/product.h
+++ b/include/product.h
@@ -77,6 +77,4 @@ struct pchrstr {
 
 extern struct pchrstr pchr[P_MDUST + 2];
 
-extern int prd_maxno;
-
 #endif /* _PRODUCT_H_ */
diff --git a/src/lib/global/init.c b/src/lib/global/init.c
index 2839b7d5..beb14f34 100644
--- a/src/lib/global/init.c
+++ b/src/lib/global/init.c
@@ -86,9 +86,8 @@ static void
 init_pchr(void)
 {
     struct pchrstr *p;
-    int pcount;
 
-    for (p = pchr, pcount = 0; pcount < prd_maxno; pcount++, p++) {
+    for (p = pchr; p->p_name; p++) {
 	if (opt_GO_RENEW) {
 	    if (p->p_type == I_DUST || p->p_type == I_OIL)
 		p->p_nrdep = 0;
diff --git a/src/lib/global/product.c b/src/lib/global/product.c
index 6a9ac1df..f4b98560 100644
--- a/src/lib/global/product.c
+++ b/src/lib/global/product.c
@@ -92,7 +92,5 @@ struct pchrstr pchr[] = {
      I_DUST, -1, 0, offsetof(struct sctstr, sct_gmin), 20, -1, 0, 0, 75,
      "gold dust", "dust",},
     {{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
-     I_NONE, 0, 0, 0, 0, 0, 0, 0, 0, "", "",}
+     I_NONE, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL,}
 };
-
-int prd_maxno = (sizeof(pchr) / sizeof(struct pchrstr)) - 1;
diff --git a/src/server/main.c b/src/server/main.c
index 4a2778ae..bec77d3d 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -531,7 +531,7 @@ nullify_objects(void)
 	if (opt_NO_LCMS)
 	    dchr[i].d_lcms = 0;
     }
-    for (i = 0; i < prd_maxno; i++) {
+    for (i = 0; pchr[i].p_name; i++) {
 	for (j = 0; j < MAXPRCON; j++) {
 	    if (opt_NO_HCMS && pchr[i].p_ctype[j] == I_HCM)
 		pchr[i].p_camt[j] = 0;