Imported Upstream version 4.0.0upstream/4.0.0

31 files changed, 310 insertions, 409 deletions

diff --git a/libxsd-frontend/xsd-frontend/traversal/any-attribute.hxx b/libxsd-frontend/xsd-frontend/traversal/any-attribute.hxx
index 55ed999..50655dd 100644
--- a/libxsd-frontend/xsd-frontend/traversal/any-attribute.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/any-attribute.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/any-attribute.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_ANY_ATTRIBUTE_HXX
diff --git a/libxsd-frontend/xsd-frontend/traversal/any.hxx b/libxsd-frontend/xsd-frontend/traversal/any.hxx
index 505d336..85a320d 100644
--- a/libxsd-frontend/xsd-frontend/traversal/any.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/any.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/any.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_ANY_HXX
diff --git a/libxsd-frontend/xsd-frontend/traversal/attribute-group.cxx b/libxsd-frontend/xsd-frontend/traversal/attribute-group.cxx
index e5c2237..a40afd7 100644
--- a/libxsd-frontend/xsd-frontend/traversal/attribute-group.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/attribute-group.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/attribute-group.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/traversal/attribute-group.hxx>
@@ -9,7 +8,7 @@ namespace XSDFrontend
 {
   namespace Traversal
   {
-    Void AttributeGroup::
+    void AttributeGroup::
     traverse (Type& g)
     {
       pre (g);
@@ -17,12 +16,12 @@ namespace XSDFrontend
       post (g);
     }
 
-    Void AttributeGroup::
+    void AttributeGroup::
     pre (Type&)
     {
     }
 
-    Void AttributeGroup::
+    void AttributeGroup::
     post (Type&)
     {
     }
diff --git a/libxsd-frontend/xsd-frontend/traversal/attribute-group.hxx b/libxsd-frontend/xsd-frontend/traversal/attribute-group.hxx
index cd01a97..03fee14 100644
--- a/libxsd-frontend/xsd-frontend/traversal/attribute-group.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/attribute-group.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/attribute-group.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_ATTRIBUTE_GROUP_HXX
@@ -15,13 +14,13 @@ namespace XSDFrontend
   {
     struct AttributeGroup: ScopeTemplate<SemanticGraph::AttributeGroup>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
   }
diff --git a/libxsd-frontend/xsd-frontend/traversal/attribute.cxx b/libxsd-frontend/xsd-frontend/traversal/attribute.cxx
index c051667..e61eeb2 100644
--- a/libxsd-frontend/xsd-frontend/traversal/attribute.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/attribute.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/attribute.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/traversal/attribute.hxx>
@@ -9,7 +8,7 @@ namespace XSDFrontend
 {
   namespace Traversal
   {
-    Void Attribute::
+    void Attribute::
     traverse (Type& a)
     {
       pre (a);
@@ -18,29 +17,29 @@ namespace XSDFrontend
       post (a);
     }
 
-    Void Attribute::
+    void Attribute::
     pre (Type&)
     {
     }
 
-    Void Attribute::
-    belongs (Type& a, EdgeDispatcherBase& d)
+    void Attribute::
+    belongs (Type& a, EdgeDispatcher& d)
     {
       d.dispatch (a.belongs ());
     }
 
-    Void Attribute::
+    void Attribute::
     belongs (Type& a)
     {
       belongs (a, *this);
     }
 
-    Void Attribute::
+    void Attribute::
     name (Type&)
     {
     }
 
-    Void Attribute::
+    void Attribute::
     post (Type&)
     {
     }
diff --git a/libxsd-frontend/xsd-frontend/traversal/attribute.hxx b/libxsd-frontend/xsd-frontend/traversal/attribute.hxx
index feb6b31..f3962e4 100644
--- a/libxsd-frontend/xsd-frontend/traversal/attribute.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/attribute.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/attribute.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_ATTRIBUTE_HXX
@@ -17,22 +16,22 @@ namespace XSDFrontend
   {
     struct Attribute : Node<SemanticGraph::Attribute>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
-      belongs (Type&, EdgeDispatcherBase&);
+      virtual void
+      belongs (Type&, EdgeDispatcher&);
 
-      virtual Void
+      virtual void
       belongs (Type&);
 
-      virtual Void
+      virtual void
       name (Type&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
   }
diff --git a/libxsd-frontend/xsd-frontend/traversal/complex.cxx b/libxsd-frontend/xsd-frontend/traversal/complex.cxx
index d6cfc41..6e936ab 100644
--- a/libxsd-frontend/xsd-frontend/traversal/complex.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/complex.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/complex.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/traversal/complex.hxx>
@@ -9,7 +8,7 @@ namespace XSDFrontend
 {
   namespace Traversal
   {
-    Void Complex::
+    void Complex::
     traverse (Type& c)
     {
       pre (c);
@@ -20,43 +19,43 @@ namespace XSDFrontend
       post (c);
     }
 
-    Void Complex::
+    void Complex::
     pre (Type&)
     {
     }
 
-    Void Complex::
+    void Complex::
     name (Type&)
     {
     }
 
-    Void Complex::
+    void Complex::
     inherits (Type& c)
     {
       inherits (c, *this);
     }
 
-    Void Complex::
-    inherits (Type& c, EdgeDispatcherBase& d)
+    void Complex::
+    inherits (Type& c, EdgeDispatcher& d)
     {
       if (c.inherits_p ())
         d.dispatch (c.inherits ());
     }
 
-    Void Complex::
+    void Complex::
     contains_compositor (Type& c)
     {
       contains_compositor (c, *this);
     }
 
-    Void Complex::
-    contains_compositor (Type& c, EdgeDispatcherBase& d)
+    void Complex::
+    contains_compositor (Type& c, EdgeDispatcher& d)
     {
       if (c.contains_compositor_p ())
         d.dispatch (c.contains_compositor ());
     }
 
-    Void Complex::
+    void Complex::
     post (Type&)
     {
     }
diff --git a/libxsd-frontend/xsd-frontend/traversal/complex.hxx b/libxsd-frontend/xsd-frontend/traversal/complex.hxx
index 3dd7e7b..1f55730 100644
--- a/libxsd-frontend/xsd-frontend/traversal/complex.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/complex.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/complex.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_COMPLEX_HXX
@@ -15,28 +14,28 @@ namespace XSDFrontend
   {
     struct Complex : ScopeTemplate<SemanticGraph::Complex>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
+      virtual void
       name (Type&);
 
-      virtual Void
+      virtual void
       inherits (Type&);
 
-      Void
-      inherits (Type&, EdgeDispatcherBase&);
+      void
+      inherits (Type&, EdgeDispatcher&);
 
-      virtual Void
+      virtual void
       contains_compositor (Type&);
 
-      Void
-      contains_compositor (Type&, EdgeDispatcherBase&);
+      void
+      contains_compositor (Type&, EdgeDispatcher&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
   }
diff --git a/libxsd-frontend/xsd-frontend/traversal/compositors.cxx b/libxsd-frontend/xsd-frontend/traversal/compositors.cxx
index d3089fc..f2b3dcd 100644
--- a/libxsd-frontend/xsd-frontend/traversal/compositors.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/compositors.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/compositors.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/traversal/compositors.hxx>
@@ -11,7 +10,7 @@ namespace XSDFrontend
   {
     // ContainsParticle
     //
-    Void ContainsParticle::
+    void ContainsParticle::
     traverse (Type& c)
     {
       dispatch (c.particle ());
@@ -20,7 +19,7 @@ namespace XSDFrontend
 
     // ContainsCompositor
     //
-    Void ContainsCompositor::
+    void ContainsCompositor::
     traverse (Type& c)
     {
       dispatch (c.compositor ());
@@ -29,7 +28,7 @@ namespace XSDFrontend
 
     // Compositor
     //
-    Void Compositor::
+    void Compositor::
     traverse (Type& c)
     {
       pre (c);
@@ -37,25 +36,25 @@ namespace XSDFrontend
       post (c);
     }
 
-    Void Compositor::
+    void Compositor::
     pre (Type&)
     {
     }
 
-    Void Compositor::
+    void Compositor::
     contains (Type& c)
     {
       iterate_and_dispatch (
         c.contains_begin (), c.contains_end (), edge_traverser ());
     }
 
-    Void Compositor::
-    contains (Type& c, EdgeDispatcherBase& d)
+    void Compositor::
+    contains (Type& c, EdgeDispatcher& d)
     {
       iterate_and_dispatch (c.contains_begin (), c.contains_end (), d);
     }
 
-    Void Compositor::
+    void Compositor::
     post (Type&)
     {
     }
@@ -63,7 +62,7 @@ namespace XSDFrontend
 
     // All
     //
-    Void All::
+    void All::
     traverse (Type& c)
     {
       pre (c);
@@ -71,25 +70,25 @@ namespace XSDFrontend
       post (c);
     }
 
-    Void All::
+    void All::
     pre (Type&)
     {
     }
 
-    Void All::
+    void All::
     contains (Type& c)
     {
       iterate_and_dispatch (
         c.contains_begin (), c.contains_end (), edge_traverser ());
     }
 
-    Void All::
-    contains (Type& c, EdgeDispatcherBase& d)
+    void All::
+    contains (Type& c, EdgeDispatcher& d)
     {
       iterate_and_dispatch (c.contains_begin (), c.contains_end (), d);
     }
 
-    Void All::
+    void All::
     post (Type&)
     {
     }
@@ -97,7 +96,7 @@ namespace XSDFrontend
 
     // Choice
     //
-    Void Choice::
+    void Choice::
     traverse (Type& c)
     {
       pre (c);
@@ -105,25 +104,25 @@ namespace XSDFrontend
       post (c);
     }
 
-    Void Choice::
+    void Choice::
     pre (Type&)
     {
     }
 
-    Void Choice::
+    void Choice::
     contains (Type& c)
     {
       iterate_and_dispatch (
         c.contains_begin (), c.contains_end (), edge_traverser ());
     }
 
-    Void Choice::
-    contains (Type& c, EdgeDispatcherBase& d)
+    void Choice::
+    contains (Type& c, EdgeDispatcher& d)
     {
       iterate_and_dispatch (c.contains_begin (), c.contains_end (), d);
     }
 
-    Void Choice::
+    void Choice::
     post (Type&)
     {
     }
@@ -131,7 +130,7 @@ namespace XSDFrontend
 
     // Sequence
     //
-    Void Sequence::
+    void Sequence::
     traverse (Type& c)
     {
       pre (c);
@@ -139,25 +138,25 @@ namespace XSDFrontend
       post (c);
     }
 
-    Void Sequence::
+    void Sequence::
     pre (Type&)
     {
     }
 
-    Void Sequence::
+    void Sequence::
     contains (Type& c)
     {
       iterate_and_dispatch (
         c.contains_begin (), c.contains_end (), edge_traverser ());
     }
 
-    Void Sequence::
-    contains (Type& c, EdgeDispatcherBase& d)
+    void Sequence::
+    contains (Type& c, EdgeDispatcher& d)
     {
       iterate_and_dispatch (c.contains_begin (), c.contains_end (), d);
     }
 
-    Void Sequence::
+    void Sequence::
     post (Type&)
     {
     }
diff --git a/libxsd-frontend/xsd-frontend/traversal/compositors.hxx b/libxsd-frontend/xsd-frontend/traversal/compositors.hxx
index e81460b..4761b99 100644
--- a/libxsd-frontend/xsd-frontend/traversal/compositors.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/compositors.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/compositors.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_COMPOSITORS_HXX
@@ -26,7 +25,7 @@ namespace XSDFrontend
         node_traverser (n);
       }
 
-      virtual Void
+      virtual void
       traverse (Type&);
     };
 
@@ -44,7 +43,7 @@ namespace XSDFrontend
         node_traverser (n);
       }
 
-      virtual Void
+      virtual void
       traverse (Type&);
     };
 
@@ -52,19 +51,19 @@ namespace XSDFrontend
     //
     struct Compositor : Node<SemanticGraph::Compositor>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
+      virtual void
       contains (Type&);
 
-      virtual Void
-      contains (Type&, EdgeDispatcherBase&);
+      virtual void
+      contains (Type&, EdgeDispatcher&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
 
@@ -73,19 +72,19 @@ namespace XSDFrontend
     //
     struct All : Node<SemanticGraph::All>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
+      virtual void
       contains (Type&);
 
-      virtual Void
-      contains (Type&, EdgeDispatcherBase&);
+      virtual void
+      contains (Type&, EdgeDispatcher&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
 
@@ -94,19 +93,19 @@ namespace XSDFrontend
     //
     struct Choice : Node<SemanticGraph::Choice>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
+      virtual void
       contains (Type&);
 
-      virtual Void
-      contains (Type&, EdgeDispatcherBase&);
+      virtual void
+      contains (Type&, EdgeDispatcher&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
 
@@ -115,19 +114,19 @@ namespace XSDFrontend
     //
     struct Sequence : Node<SemanticGraph::Sequence>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
+      virtual void
       contains (Type&);
 
-      virtual Void
-      contains (Type&, EdgeDispatcherBase&);
+      virtual void
+      contains (Type&, EdgeDispatcher&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
   }
diff --git a/libxsd-frontend/xsd-frontend/traversal/element-group.cxx b/libxsd-frontend/xsd-frontend/traversal/element-group.cxx
index cb7a51a..0b253dd 100644
--- a/libxsd-frontend/xsd-frontend/traversal/element-group.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/element-group.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/element-group.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/traversal/element-group.hxx>
@@ -9,7 +8,7 @@ namespace XSDFrontend
 {
   namespace Traversal
   {
-    Void ElementGroup::
+    void ElementGroup::
     traverse (Type& g)
     {
       pre (g);
@@ -18,24 +17,24 @@ namespace XSDFrontend
       post (g);
     }
 
-    Void ElementGroup::
+    void ElementGroup::
     pre (Type&)
     {
     }
 
-    Void ElementGroup::
-    contains_compositor (Type& g, EdgeDispatcherBase& d)
+    void ElementGroup::
+    contains_compositor (Type& g, EdgeDispatcher& d)
     {
       d.dispatch (g.contains_compositor ());
     }
 
-    Void ElementGroup::
+    void ElementGroup::
     contains_compositor (Type& g)
     {
       contains_compositor (g, *this);
     }
 
-    Void ElementGroup::
+    void ElementGroup::
     post (Type&)
     {
     }
diff --git a/libxsd-frontend/xsd-frontend/traversal/element-group.hxx b/libxsd-frontend/xsd-frontend/traversal/element-group.hxx
index 8ebe0bd..df13b26 100644
--- a/libxsd-frontend/xsd-frontend/traversal/element-group.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/element-group.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/element-group.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_ELEMENT_GROUP_HXX
@@ -15,19 +14,19 @@ namespace XSDFrontend
   {
     struct ElementGroup: ScopeTemplate<SemanticGraph::ElementGroup>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
+      virtual void
       contains_compositor (Type&);
 
-      virtual Void
-      contains_compositor (Type&, EdgeDispatcherBase&);
+      virtual void
+      contains_compositor (Type&, EdgeDispatcher&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
   }
diff --git a/libxsd-frontend/xsd-frontend/traversal/element.cxx b/libxsd-frontend/xsd-frontend/traversal/element.cxx
index 7f296ee..efdb0a6 100644
--- a/libxsd-frontend/xsd-frontend/traversal/element.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/element.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/element.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/traversal/element.hxx>
@@ -9,7 +8,7 @@ namespace XSDFrontend
 {
   namespace Traversal
   {
-    Void Element::
+    void Element::
     traverse (Type& m)
     {
       pre (m);
@@ -18,29 +17,29 @@ namespace XSDFrontend
       post (m);
     }
 
-    Void Element::
+    void Element::
     pre (Type&)
     {
     }
 
-    Void Element::
-    belongs (Type& m, EdgeDispatcherBase& d)
+    void Element::
+    belongs (Type& m, EdgeDispatcher& d)
     {
       d.dispatch (m.belongs ());
     }
 
-    Void Element::
+    void Element::
     belongs (Type& m)
     {
       belongs (m, edge_traverser ());
     }
 
-    Void Element::
+    void Element::
     name (Type&)
     {
     }
 
-    Void Element::
+    void Element::
     post (Type&)
     {
     }
diff --git a/libxsd-frontend/xsd-frontend/traversal/element.hxx b/libxsd-frontend/xsd-frontend/traversal/element.hxx
index d5187ad..e1af29a 100644
--- a/libxsd-frontend/xsd-frontend/traversal/element.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/element.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/element.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_ELEMENT_HXX
@@ -15,22 +14,22 @@ namespace XSDFrontend
   {
     struct Element : Node<SemanticGraph::Element>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
-      belongs (Type&, EdgeDispatcherBase&);
+      virtual void
+      belongs (Type&, EdgeDispatcher&);
 
-      virtual Void
+      virtual void
       belongs (Type&);
 
-      virtual Void
+      virtual void
       name (Type&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
   }
diff --git a/libxsd-frontend/xsd-frontend/traversal/elements.cxx b/libxsd-frontend/xsd-frontend/traversal/elements.cxx
index b1c47a0..e64e3b9 100644
--- a/libxsd-frontend/xsd-frontend/traversal/elements.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/elements.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/elements.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/traversal/elements.hxx>
@@ -11,7 +10,7 @@ namespace XSDFrontend
   {
     // Instance
     //
-    Void Instance::
+    void Instance::
     traverse (Type& a)
     {
       pre (a);
@@ -19,24 +18,24 @@ namespace XSDFrontend
       post (a);
     }
 
-    Void Instance::
+    void Instance::
     pre (Type&)
     {
     }
 
-    Void Instance::
-    belongs (Type& a, EdgeDispatcherBase& d)
+    void Instance::
+    belongs (Type& a, EdgeDispatcher& d)
     {
       d.dispatch (a.belongs ());
     }
 
-    Void Instance::
+    void Instance::
     belongs (Type& a)
     {
       belongs (a, edge_traverser ());
     }
 
-    Void Instance::
+    void Instance::
     post (Type&)
     {
     }
@@ -44,7 +43,7 @@ namespace XSDFrontend
 
     // Member
     //
-    Void Member::
+    void Member::
     traverse (Type& a)
     {
       pre (a);
@@ -52,24 +51,24 @@ namespace XSDFrontend
       post (a);
     }
 
-    Void Member::
+    void Member::
     pre (Type&)
     {
     }
 
-    Void Member::
-    belongs (Type& a, EdgeDispatcherBase& d)
+    void Member::
+    belongs (Type& a, EdgeDispatcher& d)
     {
       d.dispatch (a.belongs ());
     }
 
-    Void Member::
+    void Member::
     belongs (Type& a)
     {
       belongs (a, edge_traverser ());
     }
 
-    Void Member::
+    void Member::
     post (Type&)
     {
     }
diff --git a/libxsd-frontend/xsd-frontend/traversal/elements.hxx b/libxsd-frontend/xsd-frontend/traversal/elements.hxx
index c405a1b..bd1dd70 100644
--- a/libxsd-frontend/xsd-frontend/traversal/elements.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/elements.hxx
@@ -1,165 +1,97 @@
 // file      : xsd-frontend/traversal/elements.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_ELEMENTS_HXX
 #define XSD_FRONTEND_TRAVERSAL_ELEMENTS_HXX
 
-#include <cult/types.hxx>
-
-#include <frontend-elements/traversal.hxx>
+#include <cutl/compiler/traversal.hxx>
 
+#include <xsd-frontend/types.hxx>
 #include <xsd-frontend/semantic-graph/elements.hxx>
 
 namespace XSDFrontend
 {
   namespace Traversal
   {
-    using namespace Cult::Types;
-
-    namespace Bits
-    {
-      using FrontendElements::Traversal::TraverserBase;
-      using FrontendElements::Traversal::Traverser;
-
-      using FrontendElements::Traversal::DispatcherBase;
-      using FrontendElements::Traversal::Dispatcher;
-
-    }
-
-    typedef Bits::DispatcherBase<SemanticGraph::Node> NodeDispatcherBase;
-    typedef Bits::DispatcherBase<SemanticGraph::Edge> EdgeDispatcherBase;
+    using namespace cutl;
 
+    typedef compiler::dispatcher<SemanticGraph::Node> NodeDispatcher;
+    typedef compiler::dispatcher<SemanticGraph::Edge> EdgeDispatcher;
 
     //
     //
-    struct NodeBase : virtual Bits::Dispatcher<SemanticGraph::Node>,
-                      virtual Bits::Dispatcher<SemanticGraph::Edge>
+    struct NodeBase: NodeDispatcher, EdgeDispatcher
     {
-      Void
-      edge_traverser (EdgeDispatcherBase& d)
+      void
+      edge_traverser (EdgeDispatcher& d)
       {
-        Bits::Dispatcher<SemanticGraph::Edge>::traverser (d);
+        EdgeDispatcher::traverser (d);
       }
 
-      EdgeDispatcherBase&
+      EdgeDispatcher&
       edge_traverser ()
       {
         return *this;
       }
 
-    public:
-      using Bits::Dispatcher<SemanticGraph::Node>::dispatch;
-      using Bits::Dispatcher<SemanticGraph::Edge>::dispatch;
-
-      using Bits::Dispatcher<SemanticGraph::Node>::map;
-
-      using Bits::Dispatcher<SemanticGraph::Edge>::iterate_and_dispatch;
-    };
-
-
-    //
-    //
-    template <typename T>
-    struct Node : Bits::TraverserBase<SemanticGraph::Node>, virtual NodeBase
-    {
-      typedef
-      T
-      Type;
-
-      Node ()
-      {
-        map (typeid (Type), *this);
-      }
-
-      virtual Void
-      traverse (Type&) = 0;
+      using NodeDispatcher::dispatch;
+      using EdgeDispatcher::dispatch;
 
-      virtual Void
-      trampoline (SemanticGraph::Node& i)
-      {
-        traverse (dynamic_cast<Type&> (i));
-      }
-
-      virtual Void
-      trampoline (SemanticGraph::Node const&)
-      {
-        abort ();
-      }
+      using EdgeDispatcher::iterate_and_dispatch;
     };
 
-
-    //
-    //
-    struct EdgeBase : virtual Bits::Dispatcher<SemanticGraph::Edge>,
-                      virtual Bits::Dispatcher<SemanticGraph::Node>
+    struct EdgeBase: EdgeDispatcher, NodeDispatcher
     {
-      Void
-      node_traverser (NodeDispatcherBase& d)
+      void
+      node_traverser (NodeDispatcher& d)
       {
-        Bits::Dispatcher<SemanticGraph::Node>::traverser (d);
+        NodeDispatcher::traverser (d);
       }
 
-      NodeDispatcherBase&
+      NodeDispatcher&
       node_traverser ()
       {
         return *this;
       }
 
-    public:
-      using Bits::Dispatcher<SemanticGraph::Edge>::dispatch;
-      using Bits::Dispatcher<SemanticGraph::Node>::dispatch;
+      using EdgeDispatcher::dispatch;
+      using NodeDispatcher::dispatch;
 
-      using Bits::Dispatcher<SemanticGraph::Edge>::map;
-
-      using Bits::Dispatcher<SemanticGraph::Node>::iterate_and_dispatch;
-    };
-
-    template <typename T>
-    struct Edge : Bits::TraverserBase<SemanticGraph::Edge>, virtual EdgeBase
-    {
-      typedef
-      T
-      Type;
-
-      Edge ()
-      {
-        map (typeid (Type), *this);
-      }
-
-      virtual Void
-      traverse (Type&) = 0;
-
-      virtual Void
-      trampoline (SemanticGraph::Edge& i)
-      {
-        traverse (dynamic_cast<Type&> (i));
-      }
-
-      virtual Void
-      trampoline (SemanticGraph::Edge const&)
-      {
-        abort ();
-      }
+      using NodeDispatcher::iterate_and_dispatch;
     };
 
-    inline
-    EdgeBase&
+    inline EdgeBase&
     operator>> (NodeBase& n, EdgeBase& e)
     {
       n.edge_traverser (e);
       return e;
     }
 
-    inline
-    NodeBase&
+    inline NodeBase&
     operator>> (EdgeBase& e, NodeBase& n)
     {
       e.node_traverser (n);
       return n;
     }
 
+    //
+    //
+    template <typename T>
+    struct Node: compiler::traverser_impl<T, SemanticGraph::Node>,
+                 virtual NodeBase
+    {
+      typedef T Type;
+    };
+
+    template <typename T>
+    struct Edge: compiler::traverser_impl<T, SemanticGraph::Edge>,
+                 virtual EdgeBase
+    {
+      typedef T Type;
+    };
+
+    //
     // Edges
     //
 
@@ -176,7 +108,7 @@ namespace XSDFrontend
         node_traverser (n);
       }
 
-      virtual Void
+      virtual void
       traverse (Type& e)
       {
         dispatch (e.named ());
@@ -197,18 +129,17 @@ namespace XSDFrontend
         node_traverser (n);
       }
 
-      virtual Void
+      virtual void
       traverse (Type& e)
       {
         dispatch (e.type ());
       }
     };
 
-
+    //
     // Nodes
     //
 
-
     //
     //
     struct Nameable : Node<SemanticGraph::Nameable>
@@ -222,20 +153,20 @@ namespace XSDFrontend
     struct ScopeTemplate : Node<T>
     {
     public:
-      virtual Void
+      virtual void
       traverse (T& s)
       {
         names (s);
       }
 
       template<typename X>
-      Void
+      void
       names (T& s,
-             EdgeDispatcherBase& d,
-             Void (X::*pre_) (T&) = (Void (ScopeTemplate<T>::*)(T&)) (0),
-             Void (X::*post_) (T&) = (Void (ScopeTemplate<T>::*)(T&)) (0),
-             Void (X::*none_) (T&) = (Void (ScopeTemplate<T>::*)(T&)) (0),
-             Void (X::*next_) (T&) = (Void (ScopeTemplate<T>::*)(T&)) (0))
+             EdgeDispatcher& d,
+             void (X::*pre_) (T&) = (void (ScopeTemplate<T>::*)(T&)) (0),
+             void (X::*post_) (T&) = (void (ScopeTemplate<T>::*)(T&)) (0),
+             void (X::*none_) (T&) = (void (ScopeTemplate<T>::*)(T&)) (0),
+             void (X::*next_) (T&) = (void (ScopeTemplate<T>::*)(T&)) (0))
       {
         X* this_ (dynamic_cast<X*> (this));
 
@@ -266,13 +197,13 @@ namespace XSDFrontend
         }
       }
 
-      virtual Void
-      names (T& s, EdgeDispatcherBase& d)
+      virtual void
+      names (T& s, EdgeDispatcher& d)
       {
         names<ScopeTemplate<T> > (s, d);
       }
 
-      virtual Void
+      virtual void
       names (T& s)
       {
         names (s,
@@ -283,22 +214,22 @@ namespace XSDFrontend
                &ScopeTemplate<T>::names_next);
       }
 
-      virtual Void
+      virtual void
       names_pre (T&)
       {
       }
 
-      virtual Void
+      virtual void
       names_next (T&)
       {
       }
 
-      virtual Void
+      virtual void
       names_post (T&)
       {
       }
 
-      virtual Void
+      virtual void
       names_none (T&)
       {
       }
@@ -316,7 +247,7 @@ namespace XSDFrontend
     //
     struct Type : Node<SemanticGraph::Type>
     {
-      virtual Void
+      virtual void
       traverse (SemanticGraph::Type&) = 0;
     };
 
@@ -325,19 +256,19 @@ namespace XSDFrontend
     //
     struct Instance : Node<SemanticGraph::Instance>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
-      belongs (Type&, EdgeDispatcherBase&);
+      virtual void
+      belongs (Type&, EdgeDispatcher&);
 
-      virtual Void
+      virtual void
       belongs (Type&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
 
@@ -346,19 +277,19 @@ namespace XSDFrontend
     //
     struct Member : Node<SemanticGraph::Member>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
-      belongs (Type&, EdgeDispatcherBase&);
+      virtual void
+      belongs (Type&, EdgeDispatcher&);
 
-      virtual Void
+      virtual void
       belongs (Type&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
 
@@ -376,7 +307,7 @@ namespace XSDFrontend
         node_traverser (n);
       }
 
-      virtual Void
+      virtual void
       traverse (Type& e)
       {
         dispatch (e.base ());
@@ -397,7 +328,7 @@ namespace XSDFrontend
         node_traverser (n);
       }
 
-      virtual Void
+      virtual void
       traverse (Type& e)
       {
         dispatch (e.base ());
@@ -418,7 +349,7 @@ namespace XSDFrontend
         node_traverser (n);
       }
 
-      virtual Void
+      virtual void
       traverse (Type& e)
       {
         dispatch (e.base ());
@@ -439,7 +370,7 @@ namespace XSDFrontend
         node_traverser (n);
       }
 
-      virtual Void
+      virtual void
       traverse (Type& a)
       {
         dispatch (a.type ());
@@ -452,7 +383,7 @@ namespace XSDFrontend
     //
     struct Contains : Edge<SemanticGraph::Contains>
     {
-      virtual Void
+      virtual void
       traverse (Type& e)
       {
         dispatch (e.element ());
diff --git a/libxsd-frontend/xsd-frontend/traversal/elements.txx b/libxsd-frontend/xsd-frontend/traversal/elements.txx
index b673a8d..5b1aec0 100644
--- a/libxsd-frontend/xsd-frontend/traversal/elements.txx
+++ b/libxsd-frontend/xsd-frontend/traversal/elements.txx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/elements.txx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 namespace XSDFrontend
diff --git a/libxsd-frontend/xsd-frontend/traversal/enumeration.cxx b/libxsd-frontend/xsd-frontend/traversal/enumeration.cxx
index a8a49a5..124606f 100644
--- a/libxsd-frontend/xsd-frontend/traversal/enumeration.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/enumeration.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/enumeration.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/traversal/enumeration.hxx>
@@ -11,7 +10,7 @@ namespace XSDFrontend
   {
     // Enumeration
     //
-    Void Enumeration::
+    void Enumeration::
     traverse (Type& e)
     {
       pre (e);
@@ -21,30 +20,30 @@ namespace XSDFrontend
       post (e);
     }
 
-    Void Enumeration::
+    void Enumeration::
     pre (Type&)
     {
     }
 
-    Void Enumeration::
+    void Enumeration::
     name (Type&)
     {
     }
 
-    Void Enumeration::
+    void Enumeration::
     inherits (Type& e)
     {
       inherits (e, *this);
     }
 
-    Void Enumeration::
-    inherits (Type& e, EdgeDispatcherBase& d)
+    void Enumeration::
+    inherits (Type& e, EdgeDispatcher& d)
     {
       if (e.inherits_p ())
         d.dispatch (e.inherits ());
     }
 
-    Void Enumeration::
+    void Enumeration::
     post (Type&)
     {
     }
@@ -52,7 +51,7 @@ namespace XSDFrontend
 
     // Enumerator
     //
-    Void Enumerator::
+    void Enumerator::
     traverse (Type& e)
     {
       pre (e);
@@ -61,29 +60,29 @@ namespace XSDFrontend
       post (e);
     }
 
-    Void Enumerator::
+    void Enumerator::
     pre (Type&)
     {
     }
 
-    Void Enumerator::
-    belongs (Type& e, EdgeDispatcherBase& d)
+    void Enumerator::
+    belongs (Type& e, EdgeDispatcher& d)
     {
       d.dispatch (e.belongs ());
     }
 
-    Void Enumerator::
+    void Enumerator::
     belongs (Type& e)
     {
       belongs (e, edge_traverser ());
     }
 
-    Void Enumerator::
+    void Enumerator::
     name (Type&)
     {
     }
 
-    Void Enumerator::
+    void Enumerator::
     post (Type&)
     {
     }
diff --git a/libxsd-frontend/xsd-frontend/traversal/enumeration.hxx b/libxsd-frontend/xsd-frontend/traversal/enumeration.hxx
index c6d7f04..960b11c 100644
--- a/libxsd-frontend/xsd-frontend/traversal/enumeration.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/enumeration.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/enumeration.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_ENUMERATION_HXX
@@ -15,43 +14,43 @@ namespace XSDFrontend
   {
     struct Enumeration : ScopeTemplate<SemanticGraph::Enumeration>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
+      virtual void
       name (Type&);
 
-      virtual Void
+      virtual void
       inherits (Type&);
 
-      Void
-      inherits (Type&, EdgeDispatcherBase&);
+      void
+      inherits (Type&, EdgeDispatcher&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
 
     struct Enumerator : Node<SemanticGraph::Enumerator>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
-      belongs (Type&, EdgeDispatcherBase&);
+      virtual void
+      belongs (Type&, EdgeDispatcher&);
 
-      virtual Void
+      virtual void
       belongs (Type&);
 
-      virtual Void
+      virtual void
       name (Type&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
   }
diff --git a/libxsd-frontend/xsd-frontend/traversal/fundamental.cxx b/libxsd-frontend/xsd-frontend/traversal/fundamental.cxx
index b9cadec..5202adf 100644
--- a/libxsd-frontend/xsd-frontend/traversal/fundamental.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/fundamental.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/fundamental.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/traversal/fundamental.hxx>
diff --git a/libxsd-frontend/xsd-frontend/traversal/fundamental.hxx b/libxsd-frontend/xsd-frontend/traversal/fundamental.hxx
index 5c20d9c..0b771cd 100644
--- a/libxsd-frontend/xsd-frontend/traversal/fundamental.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/fundamental.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/fundamental.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_FUNDAMENTAL_HXX
diff --git a/libxsd-frontend/xsd-frontend/traversal/list.cxx b/libxsd-frontend/xsd-frontend/traversal/list.cxx
index ec434ba..9241af1 100644
--- a/libxsd-frontend/xsd-frontend/traversal/list.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/list.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/list.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/traversal/list.hxx>
@@ -9,7 +8,7 @@ namespace XSDFrontend
 {
   namespace Traversal
   {
-    Void List::
+    void List::
     traverse (Type& l)
     {
       pre (l);
@@ -18,29 +17,29 @@ namespace XSDFrontend
       post (l);
     }
 
-    Void List::
+    void List::
     pre (Type&)
     {
     }
 
-    Void List::
+    void List::
     argumented (Type& l)
     {
       argumented (l, *this);
     }
 
-    Void List::
-    argumented (Type& l, EdgeDispatcherBase& d)
+    void List::
+    argumented (Type& l, EdgeDispatcher& d)
     {
       d.dispatch (l.argumented ());
     }
 
-    Void List::
+    void List::
     name (Type&)
     {
     }
 
-    Void List::
+    void List::
     post (Type&)
     {
     }
diff --git a/libxsd-frontend/xsd-frontend/traversal/list.hxx b/libxsd-frontend/xsd-frontend/traversal/list.hxx
index 2bbc136..06aa154 100644
--- a/libxsd-frontend/xsd-frontend/traversal/list.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/list.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/list.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_LIST_HXX
@@ -15,22 +14,22 @@ namespace XSDFrontend
   {
     struct List: Node<SemanticGraph::List>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
+      virtual void
       argumented (Type&);
 
-      virtual Void
-      argumented (Type&, EdgeDispatcherBase& d);
+      virtual void
+      argumented (Type&, EdgeDispatcher& d);
 
-      virtual Void
+      virtual void
       name (Type&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
   }
diff --git a/libxsd-frontend/xsd-frontend/traversal/namespace.cxx b/libxsd-frontend/xsd-frontend/traversal/namespace.cxx
index cbc6ef2..fbf1105 100644
--- a/libxsd-frontend/xsd-frontend/traversal/namespace.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/namespace.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/namespace.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/traversal/namespace.hxx>
diff --git a/libxsd-frontend/xsd-frontend/traversal/namespace.hxx b/libxsd-frontend/xsd-frontend/traversal/namespace.hxx
index 22305e1..0dd0901 100644
--- a/libxsd-frontend/xsd-frontend/traversal/namespace.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/namespace.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/namespace.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_NAMESPACE_HXX
@@ -15,7 +14,7 @@ namespace XSDFrontend
   {
     struct Namespace: ScopeTemplate<SemanticGraph::Namespace>
     {
-      virtual Void
+      virtual void
       traverse (Type& m)
       {
         pre (m);
@@ -24,17 +23,17 @@ namespace XSDFrontend
         post (m);
       }
 
-      virtual Void
+      virtual void
       pre (Type&)
       {
       }
 
-      virtual Void
+      virtual void
       name (Type&)
       {
       }
 
-      virtual Void
+      virtual void
       post (Type&)
       {
       }
diff --git a/libxsd-frontend/xsd-frontend/traversal/particle.cxx b/libxsd-frontend/xsd-frontend/traversal/particle.cxx
index e3d3a97..1dd0ce0 100644
--- a/libxsd-frontend/xsd-frontend/traversal/particle.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/particle.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/particle.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/traversal/particle.hxx>
@@ -11,19 +10,19 @@ namespace XSDFrontend
   {
     // Particle
     //
-    Void Particle::
+    void Particle::
     traverse (Type& c)
     {
       pre (c);
       post (c);
     }
 
-    Void Particle::
+    void Particle::
     pre (Type&)
     {
     }
 
-    Void Particle::
+    void Particle::
     post (Type&)
     {
     }
diff --git a/libxsd-frontend/xsd-frontend/traversal/particle.hxx b/libxsd-frontend/xsd-frontend/traversal/particle.hxx
index 3584c12..5346ae9 100644
--- a/libxsd-frontend/xsd-frontend/traversal/particle.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/particle.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/particle.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_PARTICLE_HXX
@@ -15,13 +14,13 @@ namespace XSDFrontend
   {
     struct Particle : Node<SemanticGraph::Particle>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
   }
diff --git a/libxsd-frontend/xsd-frontend/traversal/schema.cxx b/libxsd-frontend/xsd-frontend/traversal/schema.cxx
index acfca26..090e964 100644
--- a/libxsd-frontend/xsd-frontend/traversal/schema.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/schema.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/schema.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/traversal/schema.hxx>
diff --git a/libxsd-frontend/xsd-frontend/traversal/schema.hxx b/libxsd-frontend/xsd-frontend/traversal/schema.hxx
index a975475..a38ddfd 100644
--- a/libxsd-frontend/xsd-frontend/traversal/schema.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/schema.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/schema.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_SCHEMA_HXX
@@ -26,7 +25,7 @@ namespace XSDFrontend
         node_traverser (n);
       }
 
-      virtual Void
+      virtual void
       traverse (Type& e)
       {
         dispatch (e.schema ());
@@ -46,7 +45,7 @@ namespace XSDFrontend
         node_traverser (n);
       }
 
-      virtual Void
+      virtual void
       traverse (Type& e)
       {
         dispatch (e.schema ());
@@ -67,7 +66,7 @@ namespace XSDFrontend
         node_traverser (n);
       }
 
-      virtual Void
+      virtual void
       traverse (Type& e)
       {
         dispatch (e.schema ());
@@ -88,7 +87,7 @@ namespace XSDFrontend
         node_traverser (n);
       }
 
-      virtual Void
+      virtual void
       traverse (Type& e)
       {
         dispatch (e.schema ());
@@ -109,7 +108,7 @@ namespace XSDFrontend
         node_traverser (n);
       }
 
-      virtual Void
+      virtual void
       traverse (Type& e)
       {
         dispatch (e.schema ());
@@ -121,7 +120,7 @@ namespace XSDFrontend
     //
     struct Schema: ScopeTemplate<SemanticGraph::Schema>
     {
-      virtual Void
+      virtual void
       traverse (Type& s)
       {
         pre (s);
@@ -134,12 +133,12 @@ namespace XSDFrontend
         post (s);
       }
 
-      virtual Void
+      virtual void
       pre (Type&)
       {
       }
 
-      virtual Void
+      virtual void
       post (Type&)
       {
       }
diff --git a/libxsd-frontend/xsd-frontend/traversal/union.cxx b/libxsd-frontend/xsd-frontend/traversal/union.cxx
index acf419a..fe8f7d0 100644
--- a/libxsd-frontend/xsd-frontend/traversal/union.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/union.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/union.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/traversal/union.hxx>
@@ -9,7 +8,7 @@ namespace XSDFrontend
 {
   namespace Traversal
   {
-    Void Union::
+    void Union::
     traverse (Type& u)
     {
       pre (u);
@@ -18,29 +17,29 @@ namespace XSDFrontend
       post (u);
     }
 
-    Void Union::
+    void Union::
     pre (Type&)
     {
     }
 
-    Void Union::
+    void Union::
     argumented (Type& u)
     {
       argumented (u, *this);
     }
 
-    Void Union::
-    argumented (Type& u, EdgeDispatcherBase& d)
+    void Union::
+    argumented (Type& u, EdgeDispatcher& d)
     {
       iterate_and_dispatch (u.argumented_begin (), u.argumented_end (), d);
     }
 
-    Void Union::
+    void Union::
     name (Type&)
     {
     }
 
-    Void Union::
+    void Union::
     post (Type&)
     {
     }
diff --git a/libxsd-frontend/xsd-frontend/traversal/union.hxx b/libxsd-frontend/xsd-frontend/traversal/union.hxx
index e3d31bd..8012036 100644
--- a/libxsd-frontend/xsd-frontend/traversal/union.hxx
+++ b/libxsd-frontend/xsd-frontend/traversal/union.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/union.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRAVERSAL_UNION_HXX
@@ -15,22 +14,22 @@ namespace XSDFrontend
   {
     struct Union: Node<SemanticGraph::Union>
     {
-      virtual Void
+      virtual void
       traverse (Type&);
 
-      virtual Void
+      virtual void
       pre (Type&);
 
-      virtual Void
+      virtual void
       argumented (Type&);
 
-      virtual Void
-      argumented (Type&, EdgeDispatcherBase& d);
+      virtual void
+      argumented (Type&, EdgeDispatcher& d);
 
-      virtual Void
+      virtual void
       name (Type&);
 
-      virtual Void
+      virtual void
       post (Type&);
     };
   }