--- a/src/core/attribute-test.cc	Fri Feb 22 00:08:00 2008 +0100
+++ b/src/core/attribute-test.cc	Fri Feb 22 00:11:20 2008 +0100
@@ -102,12 +102,12 @@
 		     MakeObjectVectorChecker ())
       .AddAttribute ("IntegerTraceSource1", "help text",
 		     Integer (-2),
-		     MakeIntegerTraceSourceAccessor (&AttributeObjectTest::m_intSrc1),
+		     MakeIntegerAccessor (&AttributeObjectTest::m_intSrc1),
 		     MakeIntegerChecker<int8_t> ())
       .AddAttribute ("IntegerTraceSource2", "help text",
 		     Integer (-2),
-		     MakeIntegerTraceSourceAccessor (&AttributeObjectTest::DoSetIntSrc,
-						     &AttributeObjectTest::DoGetIntSrc),
+		     MakeIntegerAccessor (&AttributeObjectTest::DoSetIntSrc,
+					  &AttributeObjectTest::DoGetIntSrc),
 		     MakeIntegerChecker<int8_t> ())
       .AddTraceSource ("Source1", "help test",
 		       MakeTraceSourceAccessor (&AttributeObjectTest::m_intSrc1))

--- a/src/core/integer-trace-source.h	Fri Feb 22 00:08:00 2008 +0100
+++ b/src/core/integer-trace-source.h	Fri Feb 22 00:11:20 2008 +0100
@@ -127,18 +127,6 @@
   T m_var;
 };
 
-template <typename T1>
-Ptr<const AttributeAccessor> MakeIntegerTraceSourceAccessor (T1 a1)
-{
-  return MakeAccessorHelper<IntegerValue> (a1);
-}
-template <typename T1, typename T2>
-Ptr<const AttributeAccessor> MakeIntegerTraceSourceAccessor (T1 a1, T2 a2)
-{
-  return MakeAccessorHelper<IntegerValue> (a1, a2);
-}
-
-
 template <typename T>
 IntegerTraceSource<T> &operator += (IntegerTraceSource<T> &lhs, IntegerTraceSource<T> const &rhs) {
   lhs.Set (lhs.Get () + rhs.Get ());