diff --git a/doc/hawick_circuits.html b/doc/hawick_circuits.html
index fb1457ac..5658b9a1 100644
--- a/doc/hawick_circuits.html
+++ b/doc/hawick_circuits.html
@@ -13,10 +13,10 @@
 <h1 id="hawick_circuits"><code>hawick_circuits</code></h1>
 
 <pre><code>template &lt;typename Graph, typename Visitor, typename VertexIndexMap&gt;
-void hawick_circuits(Graph const&amp; graph, Visitor visitor, VertexIndexMap const&amp; vim = get(vertex_index, graph), unsigned int const max_length = 0);
+void hawick_circuits(Graph const&amp; graph, Visitor visitor, VertexIndexMap const&amp; vim = get(vertex_index, graph), unsigned int max_length = 0);
 
 template &lt;typename Graph, typename Visitor, typename VertexIndexMap&gt;
-void hawick_unique_circuits(Graph const&amp; graph, Visitor visitor, VertexIndexMap const&amp; vim = get(vertex_index, graph), unsigned int const max_length = 0);
+void hawick_unique_circuits(Graph const&amp; graph, Visitor visitor, VertexIndexMap const&amp; vim = get(vertex_index, graph), unsigned int max_length = 0);
 </code></pre>
 
 <p>Enumerate all the elementary circuits (of length &le; <code>max_length</code>, if nonzero) in a directed multigraph. Specifically,
@@ -59,7 +59,7 @@ edges are not desired.</p>
   the vertex index map provided by the <code>graph</code>.</p>
 </blockquote>
 
-<p><strong>IN:</strong> <code>unsigned int const max_length = 0</code></p>
+<p><strong>IN:</strong> <code>unsigned int max_length = 0</code></p>
 
 <blockquote>
   <p>The maximum circuit length to consider. Beyond this it truncates the depth-first search, reducing the computation time by ignoring longer circuits. The default value of <code>max_length = 0</code> implies no maximum.</p>
diff --git a/include/boost/graph/hawick_circuits.hpp b/include/boost/graph/hawick_circuits.hpp
index 0ec1ece9..cefd6a13 100644
--- a/include/boost/graph/hawick_circuits.hpp
+++ b/include/boost/graph/hawick_circuits.hpp
@@ -153,7 +153,7 @@ namespace hawick_circuits_detail
     public:
         hawick_circuits_from(Graph const& graph, Visitor& visitor,
             VertexIndexMap const& vim, Stack& stack, ClosedMatrix& closed,
-            VerticesSize n_vertices, unsigned int const max_length)
+            VerticesSize n_vertices, unsigned int max_length)
         : graph_(graph)
         , visitor_(visitor)
         , vim_(vim)
@@ -298,14 +298,14 @@ namespace hawick_circuits_detail
         Stack& stack_;
         ClosedMatrix& closed_;
         BlockedMap blocked_;
-        unsigned int const max_length_;
+        unsigned int max_length_;
     };
 
     template < typename GetAdjacentVertices, typename Graph, typename Visitor,
         typename VertexIndexMap >
     void call_hawick_circuits(Graph const& graph,
         Visitor /* by value */ visitor, VertexIndexMap const& vertex_index_map,
-        unsigned int const max_length)
+        unsigned int max_length)
     {
         typedef graph_traits< Graph > Traits;
         typedef typename Traits::vertex_descriptor Vertex;
@@ -348,7 +348,7 @@ namespace hawick_circuits_detail
     template < typename GetAdjacentVertices, typename Graph, typename Visitor >
     void call_hawick_circuits(
         Graph const& graph, BOOST_FWD_REF(Visitor) visitor,
-        unsigned int const max_length)
+        unsigned int max_length)
     {
         call_hawick_circuits< GetAdjacentVertices >(graph,
             boost::forward< Visitor >(visitor), get(vertex_index, graph),
@@ -360,7 +360,7 @@ namespace hawick_circuits_detail
 template < typename Graph, typename Visitor, typename VertexIndexMap >
 void hawick_circuits(BOOST_FWD_REF(Graph) graph, BOOST_FWD_REF(Visitor) visitor,
     BOOST_FWD_REF(VertexIndexMap) vertex_index_map,
-    unsigned int const max_length = 0)
+    unsigned int max_length = 0)
 {
     hawick_circuits_detail::call_hawick_circuits<
         hawick_circuits_detail::get_all_adjacent_vertices >(
@@ -370,7 +370,7 @@ void hawick_circuits(BOOST_FWD_REF(Graph) graph, BOOST_FWD_REF(Visitor) visitor,
 
 template < typename Graph, typename Visitor >
 void hawick_circuits(BOOST_FWD_REF(Graph) graph, BOOST_FWD_REF(Visitor) visitor,
-    unsigned int const max_length = 0)
+    unsigned int max_length = 0)
 {
     hawick_circuits_detail::call_hawick_circuits<
         hawick_circuits_detail::get_all_adjacent_vertices >(
@@ -386,7 +386,7 @@ template < typename Graph, typename Visitor, typename VertexIndexMap >
 void hawick_unique_circuits(BOOST_FWD_REF(Graph) graph,
     BOOST_FWD_REF(Visitor) visitor,
     BOOST_FWD_REF(VertexIndexMap) vertex_index_map,
-    unsigned int const max_length = 0)
+    unsigned int max_length = 0)
 {
     hawick_circuits_detail::call_hawick_circuits<
         hawick_circuits_detail::get_unique_adjacent_vertices >(
@@ -397,7 +397,7 @@ void hawick_unique_circuits(BOOST_FWD_REF(Graph) graph,
 template < typename Graph, typename Visitor >
 void hawick_unique_circuits(
     BOOST_FWD_REF(Graph) graph, BOOST_FWD_REF(Visitor) visitor,
-    unsigned int const max_length = 0)
+    unsigned int max_length = 0)
 {
     hawick_circuits_detail::call_hawick_circuits<
         hawick_circuits_detail::get_unique_adjacent_vertices >(