diff --git a/include/boost/numeric/ublas/matrix_expression.hpp b/include/boost/numeric/ublas/matrix_expression.hpp
index dfe6dc73..118b889b 100644
--- a/include/boost/numeric/ublas/matrix_expression.hpp
+++ b/include/boost/numeric/ublas/matrix_expression.hpp
@@ -215,11 +215,10 @@ namespace boost { namespace numeric { namespace ublas {
                                           typename E::reference>::type reference;
 #endif
     private:
-        typedef const matrix_reference<E> const_self_type;
         typedef matrix_reference<E> self_type;
     public:
         typedef E refered_type;
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef const_closure_type closure_type;
         typedef typename E::orientation_category orientation_category;
         typedef typename E::storage_category storage_category;
@@ -515,10 +514,9 @@ namespace boost { namespace numeric { namespace ublas {
         typedef E2 expression2_type;
         typedef typename E1::const_closure_type expression1_closure_type;
         typedef typename E2::const_closure_type expression2_closure_type;
-        typedef const vector_matrix_binary<E1, E2, F> const_self_type;
         typedef vector_matrix_binary<E1, E2, F> self_type;
     public:
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef const_closure_type closure_type;
         typedef unknown_orientation_tag orientation_category;
         typedef unknown_storage_tag storage_category;
@@ -1043,10 +1041,9 @@ namespace boost { namespace numeric { namespace ublas {
         typedef E expression_type;
         typedef F functor_type;
         typedef typename E::const_closure_type expression_closure_type;
-        typedef const matrix_unary1<E, F> const_self_type;
         typedef matrix_unary1<E, F> self_type;
     public:
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef const_closure_type closure_type;
         typedef typename E::orientation_category orientation_category;
         typedef unknown_storage_tag storage_category;
@@ -1513,10 +1510,9 @@ namespace boost { namespace numeric { namespace ublas {
         typedef typename boost::mpl::if_<boost::is_const<expression_type>,
                                           typename E::const_closure_type,
                                           typename E::closure_type>::type expression_closure_type;
-        typedef const matrix_unary2<E, F> const_self_type;
         typedef matrix_unary2<E, F> self_type;
     public:
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef self_type closure_type;
         // typedef typename E::orientation_category orientation_category;
         typedef typename boost::mpl::if_<boost::is_same<typename E::orientation_category,
@@ -1981,10 +1977,9 @@ namespace boost { namespace numeric { namespace ublas {
         typedef F functor_type;
         typedef typename E1::const_closure_type expression1_closure_type;
         typedef typename E2::const_closure_type expression2_closure_type;
-        typedef const matrix_binary<E1, E2, F> const_self_type;
         typedef matrix_binary<E1, E2, F> self_type;
     public:
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef const_closure_type closure_type;
         typedef unknown_orientation_tag orientation_category;
         typedef unknown_storage_tag storage_category;
@@ -2737,10 +2732,9 @@ namespace boost { namespace numeric { namespace ublas {
         typedef F functor_type;
         typedef E1 expression1_closure_type;
         typedef typename E2::const_closure_type expression2_closure_type;
-        typedef const matrix_binary_scalar1<E1, E2, F> const_self_type;
         typedef matrix_binary_scalar1<E1, E2, F> self_type;
     public:
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef const_closure_type closure_type;
         typedef typename E2::orientation_category orientation_category;
         typedef unknown_storage_tag storage_category;
@@ -3198,10 +3192,9 @@ namespace boost { namespace numeric { namespace ublas {
         typedef F functor_type;
         typedef typename E1::const_closure_type expression1_closure_type;
         typedef E2 expression2_closure_type;
-        typedef const matrix_binary_scalar2<E1, E2, F> const_self_type;
         typedef matrix_binary_scalar2<E1, E2, F> self_type;
     public:
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef const_closure_type closure_type;
         typedef typename E1::orientation_category orientation_category;
         typedef unknown_storage_tag storage_category;
@@ -3669,10 +3662,9 @@ namespace boost { namespace numeric { namespace ublas {
         typedef F functor_type;
         typedef typename E1::const_closure_type expression1_closure_type;
         typedef typename E2::const_closure_type expression2_closure_type;
-        typedef const matrix_vector_binary1<E1, E2, F> const_self_type;
         typedef matrix_vector_binary1<E1, E2, F> self_type;
     public:
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef const_closure_type closure_type;
         typedef unknown_storage_tag storage_category;
 
@@ -4073,10 +4065,9 @@ namespace boost { namespace numeric { namespace ublas {
         typedef F functor_type;
         typedef typename E1::const_closure_type expression1_closure_type;
         typedef typename E2::const_closure_type expression2_closure_type;
-        typedef const matrix_vector_binary2<E1, E2, F> const_self_type;
         typedef matrix_vector_binary2<E1, E2, F> self_type;
     public:
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef const_closure_type closure_type;
         typedef unknown_storage_tag storage_category;
 
@@ -4478,10 +4469,9 @@ namespace boost { namespace numeric { namespace ublas {
         typedef F functor_type;
         typedef typename E1::const_closure_type expression1_closure_type;
         typedef typename E2::const_closure_type expression2_closure_type;
-        typedef const matrix_matrix_binary<E1, E2, F> const_self_type;
         typedef matrix_matrix_binary<E1, E2, F> self_type;
     public:
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef const_closure_type closure_type;
         typedef unknown_orientation_tag orientation_category;
         typedef unknown_storage_tag storage_category;
diff --git a/include/boost/numeric/ublas/vector_expression.hpp b/include/boost/numeric/ublas/vector_expression.hpp
index 74928340..f250cf81 100644
--- a/include/boost/numeric/ublas/vector_expression.hpp
+++ b/include/boost/numeric/ublas/vector_expression.hpp
@@ -220,11 +220,10 @@ namespace boost { namespace numeric { namespace ublas {
                                           typename E::reference>::type reference;
 #endif
     private:
-        typedef const vector_reference<E> const_self_type;
         typedef vector_reference<E> self_type;
     public:
         typedef E refered_type;
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef const_closure_type closure_type;
         typedef typename E::storage_category storage_category;
         typedef typename E::simd_category simd_category;
@@ -473,10 +472,9 @@ namespace boost { namespace numeric { namespace ublas {
         typedef typename boost::mpl::if_<boost::is_const<expression_type>,
                                           typename E::const_closure_type,
                                           typename E::closure_type>::type expression_closure_type;
-        typedef const vector_unary<E, F> const_self_type;
         typedef vector_unary<E, F> self_type;
     public:
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef self_type closure_type;
         typedef unknown_storage_tag storage_category;
 
@@ -774,10 +772,9 @@ namespace boost { namespace numeric { namespace ublas {
         typedef F functor_type;
         typedef typename E1::const_closure_type expression1_closure_type;
         typedef typename E2::const_closure_type expression2_closure_type;
-        typedef const vector_binary<E1, E2, F> const_self_type;
         typedef vector_binary<E1, E2, F> self_type;
     public:
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef const_closure_type closure_type;
         typedef unknown_storage_tag storage_category;
 
@@ -1171,10 +1168,9 @@ namespace boost { namespace numeric { namespace ublas {
         typedef F functor_type;
         typedef E1 expression1_closure_type;
         typedef typename E2::const_closure_type expression2_closure_type;
-        typedef const vector_binary_scalar1<E1, E2, F> const_self_type;
         typedef vector_binary_scalar1<E1, E2, F> self_type;
     public:
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef const_closure_type closure_type;
         typedef unknown_storage_tag storage_category;
 
@@ -1422,10 +1418,9 @@ namespace boost { namespace numeric { namespace ublas {
         typedef F functor_type;
         typedef typename E1::const_closure_type expression1_closure_type;
         typedef E2 expression2_closure_type;
-        typedef const vector_binary_scalar2<E1, E2, F> const_self_type;
         typedef vector_binary_scalar2<E1, E2, F> self_type;
     public:
-        typedef const_self_type const_closure_type;
+        typedef const self_type const_closure_type;
         typedef const_closure_type closure_type;
         typedef unknown_storage_tag storage_category;