diff --git a/src/internal/Block.h b/src/internal/Block.h
index 2104a23c9..90bb9ac8a 100644
--- a/src/internal/Block.h
+++ b/src/internal/Block.h
@@ -33,8 +33,6 @@ template<typename MatrixType> class EiBlock
     typedef typename MatrixType::Scalar Scalar;
     typedef typename MatrixType::Ref MatRef;
     friend class EiObject<Scalar, EiBlock<MatrixType> >;
-    typedef EiBlock Ref;
-    typedef EiBlock ConstRef;
     
     static const int RowsAtCompileTime = EiDynamic,
                      ColsAtCompileTime = EiDynamic;
@@ -56,8 +54,8 @@ template<typename MatrixType> class EiBlock
     EI_INHERIT_ASSIGNMENT_OPERATORS(EiBlock)
     
   private:
-    Ref& _ref() { return *this; }
-    const Ref& _constRef() const { return *this; }
+    EiBlock& _ref() { return *this; }
+    const EiBlock& _constRef() const { return *this; }
     int _rows() const { return m_endRow - m_startRow + 1; }
     int _cols() const { return m_endCol - m_startCol + 1; }
     
diff --git a/src/internal/MatrixOps.h b/src/internal/MatrixOps.h
index 480b7bef9..54803a95c 100644
--- a/src/internal/MatrixOps.h
+++ b/src/internal/MatrixOps.h
@@ -34,8 +34,6 @@ template<typename Lhs, typename Rhs> class EiSum
     typedef typename Lhs::ConstRef LhsRef;
     typedef typename Rhs::ConstRef RhsRef;
     friend class EiObject<Scalar, EiSum>;
-    typedef EiSum Ref;
-    typedef EiSum ConstRef;
     
     static const int RowsAtCompileTime = Lhs::RowsAtCompileTime,
                      ColsAtCompileTime = Rhs::ColsAtCompileTime;
@@ -53,8 +51,8 @@ template<typename Lhs, typename Rhs> class EiSum
 
   private:
   
-    const Ref& _ref() const { return *this; }
-    const ConstRef& _constRef() const { return *this; }
+    const EiSum& _ref() const { return *this; }
+    const EiSum& _constRef() const { return *this; }
     int _rows() const { return m_lhs.rows(); }
     int _cols() const { return m_lhs.cols(); }
 
@@ -76,8 +74,6 @@ template<typename Lhs, typename Rhs> class EiDifference
     typedef typename Lhs::ConstRef LhsRef;
     typedef typename Rhs::ConstRef RhsRef;
     friend class EiObject<Scalar, EiDifference>;
-    typedef EiDifference Ref;
-    typedef EiDifference ConstRef;
     
     static const int RowsAtCompileTime = Lhs::RowsAtCompileTime,
                      ColsAtCompileTime = Rhs::ColsAtCompileTime;
@@ -94,8 +90,8 @@ template<typename Lhs, typename Rhs> class EiDifference
     EI_INHERIT_ASSIGNMENT_OPERATORS(EiDifference)
 
   private:
-    const Ref& _ref() const { return *this; }
-    const Ref& _constRef() const { return *this; }
+    const EiDifference& _ref() const { return *this; }
+    const EiDifference& _constRef() const { return *this; }
     int _rows() const { return m_lhs.rows(); }
     int _cols() const { return m_lhs.cols(); }
 
@@ -117,8 +113,6 @@ template<typename Lhs, typename Rhs> class EiMatrixProduct
     typedef typename Lhs::ConstRef LhsRef;
     typedef typename Rhs::ConstRef RhsRef;
     friend class EiObject<Scalar, EiMatrixProduct>;
-    typedef EiMatrixProduct Ref;
-    typedef EiMatrixProduct ConstRef;
     
     static const int RowsAtCompileTime = Lhs::RowsAtCompileTime,
                      ColsAtCompileTime = Rhs::ColsAtCompileTime;
@@ -135,8 +129,8 @@ template<typename Lhs, typename Rhs> class EiMatrixProduct
     EI_INHERIT_ASSIGNMENT_OPERATORS(EiMatrixProduct)
     
   private:
-    const Ref& _ref() const { return *this; }
-    const Ref& _constRef() const { return *this; }
+    const EiMatrixProduct& _ref() const { return *this; }
+    const EiMatrixProduct& _constRef() const { return *this; }
     int _rows() const { return m_lhs.rows(); }
     int _cols() const { return m_rhs.cols(); }
     
diff --git a/src/internal/Minor.h b/src/internal/Minor.h
index 08086bbcc..217ee9059 100644
--- a/src/internal/Minor.h
+++ b/src/internal/Minor.h
@@ -33,8 +33,6 @@ template<typename MatrixType> class EiMinor
     typedef typename MatrixType::Scalar Scalar;
     typedef typename MatrixType::Ref MatRef;
     friend class EiObject<Scalar, EiMinor<MatrixType> >;
-    typedef EiMinor Ref;
-    typedef EiMinor ConstRef;
     
     static const int
       RowsAtCompileTime = (MatrixType::RowsAtCompileTime != EiDynamic) ?
@@ -55,8 +53,8 @@ template<typename MatrixType> class EiMinor
     EI_INHERIT_ASSIGNMENT_OPERATORS(EiMinor)
     
   private:
-    Ref& _ref() { return *this; }
-    const ConstRef& _constRef() const { return *this; }
+    EiMinor& _ref() { return *this; }
+    const EiMinor& _constRef() const { return *this; }
     int _rows() const { return m_matrix.rows() - 1; }
     int _cols() const { return m_matrix.cols() - 1; }
     
diff --git a/src/internal/RowAndCol.h b/src/internal/RowAndCol.h
index 8235ce1fc..62a9d56da 100644
--- a/src/internal/RowAndCol.h
+++ b/src/internal/RowAndCol.h
@@ -33,8 +33,6 @@ template<typename MatrixType> class EiRow
     typedef typename MatrixType::Scalar Scalar;
     typedef typename MatrixType::Ref MatRef;
     friend class EiObject<Scalar, EiRow<MatrixType> >;
-    typedef EiRow Ref;
-    typedef EiRow ConstRef;
 
     static const int RowsAtCompileTime = MatrixType::ColsAtCompileTime,
                      ColsAtCompileTime = 1;
@@ -57,8 +55,8 @@ template<typename MatrixType> class EiRow
     EI_INHERIT_ASSIGNMENT_OPERATORS(EiRow)
     
   private:
-    Ref& _ref() { return *this; }
-    const ConstRef& _constRef() const { return *this; }
+    EiRow& _ref() { return *this; }
+    const EiRow& _constRef() const { return *this; }
     
     int _rows() const { return m_matrix.cols(); }
     int _cols() const { return 1; }
@@ -89,8 +87,6 @@ template<typename MatrixType> class EiColumn
     typedef typename MatrixType::Scalar Scalar;
     typedef typename MatrixType::Ref MatRef;
     friend class EiObject<Scalar, EiColumn<MatrixType> >;
-    typedef EiColumn Ref;
-    typedef EiColumn ConstRef;
     
     static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
                      ColsAtCompileTime = 1;
@@ -107,8 +103,8 @@ template<typename MatrixType> class EiColumn
     EI_INHERIT_ASSIGNMENT_OPERATORS(EiColumn)
     
   private:
-    Ref& _ref() { return *this; }
-    const ConstRef& _constRef() const { return *this; }
+    EiColumn& _ref() { return *this; }
+    const EiColumn& _constRef() const { return *this; }
     int _rows() const { return m_matrix.rows(); }
     int _cols() const { return 1; }
     
diff --git a/src/internal/ScalarOps.h b/src/internal/ScalarOps.h
index 69e98eeb6..e2acfb5d9 100644
--- a/src/internal/ScalarOps.h
+++ b/src/internal/ScalarOps.h
@@ -32,8 +32,6 @@ template<typename MatrixType> class EiScalarProduct
   public:
     typedef typename MatrixType::Scalar Scalar;
     typedef typename MatrixType::ConstRef MatRef;
-    typedef EiScalarProduct Ref;
-    typedef EiScalarProduct ConstRef;
     friend class EiObject<typename MatrixType::Scalar, EiScalarProduct<MatrixType> >;
 
     static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
@@ -48,8 +46,8 @@ template<typename MatrixType> class EiScalarProduct
     EI_INHERIT_ASSIGNMENT_OPERATORS(EiScalarProduct)
 
   private:
-    const Ref& _ref() const { return *this; }
-    const ConstRef& _constRef() const { return *this; }
+    const EiScalarProduct& _ref() const { return *this; }
+    const EiScalarProduct& _constRef() const { return *this; }
     int _rows() const { return m_matrix.rows(); }
     int _cols() const { return m_matrix.cols(); }