Index: net_len.c
===================================================================
--- net_len.c	(revision 34939)
+++ net_len.c	(revision 34940)
@@ -490,19 +490,10 @@
 	vtp0_uninit(&ns->objs);
 }
 
-pcb_qry_netseg_len_t *pcb_qry_parent_net_len_mapseg(pcb_board_t *pcb, pcb_any_obj_t *from)
+pcb_qry_netseg_len_t *pcb_qry_parent_net_len_mapseg(pcb_qry_exec_t *ec, pcb_any_obj_t *from)
 {
-	pcb_qry_netseg_len_t *res;
-	pcb_qry_exec_t ec = {0};
-
-	ec.pcb = pcb;
-	pcb_qry_parent_net_lenseg_init(&ec);
-
-	res = pcb_qry_parent_net_lenseg_(&ec, from);
-
-	pcb_qry_uninit(&ec);
-
-	return res;
+	pcb_qry_parent_net_lenseg_init(ec);
+	return pcb_qry_parent_net_lenseg_(ec, from);
 }
 
 const char pcb_acts_QueryCalcNetLen[] = "QueryCalcNetLen(netname)";
Index: net_len.h
===================================================================
--- net_len.h	(revision 34939)
+++ net_len.h	(revision 34940)
@@ -13,7 +13,7 @@
 pcb_qry_netseg_len_t *pcb_qry_parent_net_lenseg(pcb_qry_exec_t *ec, pcb_any_obj_t *from);
 
 /* Return a segment (up to the first junction) starting from an object */
-pcb_qry_netseg_len_t *pcb_qry_parent_net_len_mapseg(pcb_board_t *pcb, pcb_any_obj_t *from);
+pcb_qry_netseg_len_t *pcb_qry_parent_net_len_mapseg(pcb_qry_exec_t *ec, pcb_any_obj_t *from);
 
 
 void pcb_qry_lenseg_free_fields(pcb_qry_netseg_len_t *ns);