diff --git a/crates/fj-core/src/operations/split/edge.rs b/crates/fj-core/src/operations/split/edge.rs
index fb0237a46..93dcb8cb5 100644
--- a/crates/fj-core/src/operations/split/edge.rs
+++ b/crates/fj-core/src/operations/split/edge.rs
@@ -3,7 +3,7 @@ use fj_math::Point;
 use crate::{
     objects::{HalfEdge, Shell},
     operations::{
-        derive::DeriveFrom, geometry::UpdateHalfEdgeGeometry, insert::Insert,
+        geometry::UpdateHalfEdgeGeometry, insert::Insert,
         replace::ReplaceHalfEdge, split::SplitHalfEdge, update::UpdateHalfEdge,
     },
     queries::SiblingOfHalfEdge,
@@ -40,11 +40,7 @@ impl SplitEdge for Shell {
             .get_sibling_of(half_edge)
             .expect("Expected half-edge and its sibling to be part of shell");
 
-        let [half_edge_a, half_edge_b] = half_edge
-            .split_half_edge(point, core)
-            .map(|half_edge_part| {
-                half_edge_part.insert(core).derive_from(half_edge, core)
-            });
+        let [half_edge_a, half_edge_b] = half_edge.split_half_edge(point, core);
 
         let siblings = {
             let [sibling_a, sibling_b] = sibling.split_half_edge(point, core);
@@ -53,22 +49,14 @@ impl SplitEdge for Shell {
                     |_, _| half_edge_b.start_vertex().clone(),
                     core,
                 )
-                .insert(core);
-            [sibling_a, sibling_b].map(|half_edge| {
-                half_edge.insert(core).derive_from(&sibling, core).set_path(
-                    core.layers.geometry.of_half_edge(&sibling).path,
+                .insert(core)
+                .set_path(
+                    core.layers.geometry.of_half_edge(&sibling_b).path,
                     &mut core.layers.geometry,
-                )
-            })
-        };
+                );
 
-        let [half_edge_a, half_edge_b] =
-            [half_edge_a, half_edge_b].map(|half_edge_part| {
-                half_edge_part.set_path(
-                    core.layers.geometry.of_half_edge(half_edge).path,
-                    &mut core.layers.geometry,
-                )
-            });
+            [sibling_a, sibling_b]
+        };
 
         let shell = self
             .replace_half_edge(
diff --git a/crates/fj-core/src/operations/split/half_edge.rs b/crates/fj-core/src/operations/split/half_edge.rs
index c899e3222..34dacf019 100644
--- a/crates/fj-core/src/operations/split/half_edge.rs
+++ b/crates/fj-core/src/operations/split/half_edge.rs
@@ -3,7 +3,7 @@ use fj_math::Point;
 use crate::{
     geometry::HalfEdgeGeometry,
     objects::{HalfEdge, Vertex},
-    operations::insert::Insert,
+    operations::{derive::DeriveFrom, insert::Insert},
     storage::Handle,
     Core,
 };
@@ -48,13 +48,15 @@ impl SplitHalfEdge for Handle<HalfEdge> {
             self.curve().clone(),
             self.start_vertex().clone(),
         )
-        .insert(core);
+        .insert(core)
+        .derive_from(self, core);
         let b = HalfEdge::new(
             [point, end],
             self.curve().clone(),
             Vertex::new().insert(core),
         )
-        .insert(core);
+        .insert(core)
+        .derive_from(self, core);
 
         core.layers.geometry.define_half_edge(
             a.clone(),