--- a/include/topology/dynamic-persistence.hpp	Wed Feb 03 14:51:38 2010 -0800
+++ b/include/topology/dynamic-persistence.hpp	Thu Feb 04 23:43:36 2010 -0800
@@ -34,7 +34,8 @@
 DynamicPersistenceTrails<D,CT,OT,E,Cmp,CCmp>::
 pair_simplices()
 { 
-    Parent::pair_simplices(begin(), end(), true, PairingTrailsVisitor(order(), ccmp_, size()));
+    PairingTrailsVisitor visitor(order(), ccmp_, size());
+    Parent::pair_simplices(begin(), end(), true, visitor);
 }
 
 template<class D, class CT, class OT, class E, class Cmp, class CCmp>
@@ -300,5 +301,6 @@
 DynamicPersistenceChains<D,CT,OT,E,Cmp,CCmp>::
 pair_simplices()
 { 
-    Parent::pair_simplices(begin(), end(), true, PairingChainsVisitor(order(), ccmp_, size()));
+    PairingChainsVisitor visitor(order(), ccmp_, size());
+    Parent::pair_simplices(begin(), end(), true, visitor);
 }

--- a/include/topology/static-persistence.hpp	Wed Feb 03 14:51:38 2010 -0800
+++ b/include/topology/static-persistence.hpp	Thu Feb 04 23:43:36 2010 -0800
@@ -47,9 +47,15 @@
 pair_simplices(bool progress)
 { 
     if (progress) 
-        pair_simplices<PairVisitor>(begin(), end(), false, PairVisitor(size())); 
+    {
+        PairVisitor visitor(size());
+        pair_simplices<PairVisitor>(begin(), end(), false, visitor); 
+    }
     else
-        pair_simplices<PairVisitorNoProgress>(begin(), end(), false, PairVisitorNoProgress());
+    {
+        PairVisitorNoProgress visitor;
+        pair_simplices<PairVisitorNoProgress>(begin(), end(), false, visitor);
+    }
 }
 
 template<class D, class CT, class OT, class E, class Cmp>