diff -r ef2d00e46897 -r c2992fd74dad lemon/smart_graph.h
--- a/lemon/smart_graph.h	Wed Feb 22 12:45:59 2006 +0000
+++ b/lemon/smart_graph.h	Wed Feb 22 18:26:56 2006 +0000
@@ -27,16 +27,13 @@
 
 #include <lemon/invalid.h>
 
-#include <lemon/bits/clearable_graph_extender.h>
-#include <lemon/bits/extendable_graph_extender.h>
-#include <lemon/bits/iterable_graph_extender.h>
-#include <lemon/bits/alteration_notifier.h>
-#include <lemon/bits/default_map.h>
 #include <lemon/bits/graph_extender.h>
 
 #include <lemon/utility.h>
 #include <lemon/error.h>
 
+#include <lemon/bits/graph_extender.h>
+
 namespace lemon {
 
   class SmartGraph;
@@ -222,12 +219,7 @@
 
   };
 
-  typedef ClearableGraphExtender<
-    ExtendableGraphExtender<
-    MappableGraphExtender<
-    IterableGraphExtender<
-    AlterableGraphExtender<
-    GraphExtender<SmartGraphBase> > > > > > ExtendedSmartGraphBase;
+  typedef GraphExtender<SmartGraphBase> ExtendedSmartGraphBase;
 
   /// \ingroup graphs
 
@@ -244,7 +236,9 @@
   ///\author Alpar Juttner
   class SmartGraph : public ExtendedSmartGraphBase {
   public:
-    
+
+    typedef ExtendedSmartGraphBase Parent;
+
     class Snapshot;
     friend class Snapshot;
 
@@ -355,12 +349,8 @@
 
   /**************** Undirected List Graph ****************/
 
-  typedef ClearableUGraphExtender<
-    ExtendableUGraphExtender<
-    MappableUGraphExtender<
-    IterableUGraphExtender<
-    AlterableUGraphExtender<
-    UGraphExtender<SmartGraphBase> > > > > > ExtendedSmartUGraphBase;
+  typedef UGraphExtender<UGraphBaseExtender<SmartGraphBase> >
+  ExtendedSmartUGraphBase;
 
   /// \ingroup graphs
   ///
@@ -587,14 +577,8 @@
   };
 
 
-  typedef ClearableBpUGraphExtender<
-    ExtendableBpUGraphExtender<
-    MappableBpUGraphExtender<
-    IterableBpUGraphExtender<
-    AlterableBpUGraphExtender<
-    BpUGraphExtender <
-    SmartBpUGraphBase> > > > > >
-  ExtendedSmartBpUGraphBase;
+  typedef BpUGraphExtender< BpUGraphBaseExtender<
+    SmartBpUGraphBase> > ExtendedSmartBpUGraphBase;
 
   /// \ingroup graphs
   ///