diff --git a/include/r_local.h b/include/r_local.h
index dab2e26de..e6f4c19f0 100644
--- a/include/r_local.h
+++ b/include/r_local.h
@@ -310,7 +310,7 @@ extern int r_numvisedicts;
 extern struct entity_s *r_visedicts[];
 struct dlight_s;
 
-void R_StoreEfrags (efrag_t **ppefrag);
+void R_StoreEfrags (const efrag_t *ppefrag);
 void R_TimeRefresh_f (void);
 void R_TimeGraph (void);
 void R_ZGraph (void);
diff --git a/libs/video/renderer/gl/gl_rsurf.c b/libs/video/renderer/gl/gl_rsurf.c
index 105ef108d..262b7ed5e 100644
--- a/libs/video/renderer/gl/gl_rsurf.c
+++ b/libs/video/renderer/gl/gl_rsurf.c
@@ -564,7 +564,7 @@ visit_leaf (mleaf_t *leaf)
 {
 	// deal with model fragments in this leaf
 	if (leaf->efrags)
-		R_StoreEfrags (&leaf->efrags);
+		R_StoreEfrags (leaf->efrags);
 }
 
 static inline int
diff --git a/libs/video/renderer/r_efrag.c b/libs/video/renderer/r_efrag.c
index bc583c82f..7cfc55cd8 100644
--- a/libs/video/renderer/r_efrag.c
+++ b/libs/video/renderer/r_efrag.c
@@ -215,20 +215,13 @@ R_AddEfrags (entity_t *ent)
 	ent->topnode = r_pefragtopnode;
 }
 
-/*
-	R_StoreEfrags
-
-	FIXME: a lot of this goes away with edge-based
-*/
 void
-R_StoreEfrags (efrag_t **ppefrag)
+R_StoreEfrags (const efrag_t *pefrag)
 {
 	entity_t   *pent;
 	model_t    *model;
-	efrag_t    *pefrag;
 
-
-	while ((pefrag = *ppefrag) != NULL) {
+	while (pefrag) {
 		pent = pefrag->entity;
 		model = pent->model;
 
@@ -248,7 +241,7 @@ R_StoreEfrags (efrag_t **ppefrag)
 					pent->visframe = r_framecount;
 				}
 
-				ppefrag = &pefrag->leafnext;
+				pefrag = pefrag->leafnext;
 				break;
 
 			default:
diff --git a/libs/video/renderer/sw/sw_rbsp.c b/libs/video/renderer/sw/sw_rbsp.c
index 03f0aeba0..ede228fa3 100644
--- a/libs/video/renderer/sw/sw_rbsp.c
+++ b/libs/video/renderer/sw/sw_rbsp.c
@@ -400,7 +400,7 @@ visit_leaf (mleaf_t *leaf)
 {
 	// deal with model fragments in this leaf
 	if (leaf->efrags)
-		R_StoreEfrags (&leaf->efrags);
+		R_StoreEfrags (leaf->efrags);
 	leaf->key = r_currentkey;
 	r_currentkey++;				// all bmodels in a leaf share the same key
 }
@@ -611,7 +611,7 @@ R_RecursiveWorldNode (mnode_t *node, int clipflags)
 		pleaf = (mleaf_t *) node;
 		// deal with model fragments in this leaf
 		if (pleaf->efrags) {
-			R_StoreEfrags (&pleaf->efrags);
+			R_StoreEfrags (pleaf->efrags);
 		}
 
 		pleaf->key = r_currentkey;
diff --git a/libs/video/renderer/sw32/sw32_rbsp.c b/libs/video/renderer/sw32/sw32_rbsp.c
index 2cce998e5..ce3ef050b 100644
--- a/libs/video/renderer/sw32/sw32_rbsp.c
+++ b/libs/video/renderer/sw32/sw32_rbsp.c
@@ -400,7 +400,7 @@ visit_leaf (mleaf_t *leaf)
 {
 	// deal with model fragments in this leaf
 	if (leaf->efrags)
-		R_StoreEfrags (&leaf->efrags);
+		R_StoreEfrags (leaf->efrags);
 	leaf->key = r_currentkey;
 	r_currentkey++;				// all bmodels in a leaf share the same key
 }
@@ -611,7 +611,7 @@ R_RecursiveWorldNode (mnode_t *node, int clipflags)
 		pleaf = (mleaf_t *) node;
 		// deal with model fragments in this leaf
 		if (pleaf->efrags) {
-			R_StoreEfrags (&pleaf->efrags);
+			R_StoreEfrags (pleaf->efrags);
 		}
 
 		pleaf->key = r_currentkey;