diff --git a/swapdata.cc b/swapdata.cc
index f390f7117..c7eaed414 100644
--- a/swapdata.cc
+++ b/swapdata.cc
@@ -40,11 +40,9 @@ void SwapDataFilter::swapdata_cb(const Waypoint* ref)
 
 void SwapDataFilter::process()	/* this procedure must be present in vecs */
 {
-  WayptFunctor<SwapDataFilter> swapdata_cb_f(this, &SwapDataFilter::swapdata_cb);
-
-  waypt_disp_all(swapdata_cb_f);
-  route_disp_all(nullptr, nullptr, swapdata_cb_f);
-  track_disp_all(nullptr, nullptr, swapdata_cb_f);
+  waypt_disp_all(swapdata_cb);
+  route_disp_all(nullptr, nullptr, swapdata_cb);
+  track_disp_all(nullptr, nullptr, swapdata_cb);
 }
 
 #endif // FILTERS_ENABLED
diff --git a/swapdata.h b/swapdata.h
index 58dd9e99a..0f829f8bb 100644
--- a/swapdata.h
+++ b/swapdata.h
@@ -43,7 +43,7 @@ class SwapDataFilter:public Filter
   QVector<arglist_t> args = {
   };
 
-  void swapdata_cb(const Waypoint* ref);
+  static void swapdata_cb(const Waypoint* ref);
 
 };
 
diff --git a/trackfilter.cc b/trackfilter.cc
index 0163ca5b2..c9010f126 100644
--- a/trackfilter.cc
+++ b/trackfilter.cc
@@ -950,7 +950,6 @@ void TrackFilter::trackfilter_segment_head(const route_head* rte)
 
 void TrackFilter::init()
 {
-  RteHdFunctor<TrackFilter> trackfilter_segment_head_f(this, &TrackFilter::trackfilter_segment_head);
   RteHdFunctor<TrackFilter> trackfilter_fill_track_list_cb_f(this, &TrackFilter::trackfilter_fill_track_list_cb);
 
   /*
@@ -972,7 +971,7 @@ void TrackFilter::init()
 
   // Perform segmenting first.
   if (opt_segment) {
-    track_disp_all(trackfilter_segment_head_f, nullptr, nullptr);
+    track_disp_all(trackfilter_segment_head, nullptr, nullptr);
   }
 
   track_list.clear();
diff --git a/trackfilter.h b/trackfilter.h
index 79eccb1a3..3dba0b4b3 100644
--- a/trackfilter.h
+++ b/trackfilter.h
@@ -220,7 +220,7 @@ class TrackFilter:public Filter
   void trackfilter_faketime();             /* returns number of track points left after filtering */
   static bool trackfilter_points_are_same(const Waypoint* wpta, const Waypoint* wptb);
 
-  void trackfilter_segment_head(const route_head* rte);
+  static void trackfilter_segment_head(const route_head* rte);
 
 };