diff --git a/include/armadillo_bits/unwrap.hpp b/include/armadillo_bits/unwrap.hpp
index b6be60bc..77ead018 100644
--- a/include/armadillo_bits/unwrap.hpp
+++ b/include/armadillo_bits/unwrap.hpp
@@ -21,7 +21,7 @@
 
 
 // TODO: document the conditions and restrictions for the use of each unwrap variant:
-// TODO: unwrap, unwrap_check, quasi_unwrap, partial_unwrap, partial_unwrap_check
+// TODO: unwrap, unwrap_check, quasi_unwrap, partial_unwrap
 
 
 template<typename T1>
@@ -2425,1038 +2425,6 @@ struct partial_unwrap< eOp<subview_row<eT>, eop_neg> >
 
 
 
-//
-
-
-
-template<typename T1>
-struct partial_unwrap_check_default
-  {
-  typedef typename T1::elem_type eT;
-  typedef Mat<eT>                stored_type;
-  
-  inline
-  partial_unwrap_check_default(const T1& A, const Mat<eT>&)
-    : M(A)
-    {
-    arma_debug_sigprint();
-    }
-  
-  constexpr eT get_val() const { return eT(1); }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = false;
-  
-  const Mat<eT> M;
-  };
-
-
-template<typename T1>
-struct partial_unwrap_check_fixed
-  {
-  typedef typename T1::elem_type eT;
-  typedef T1                     stored_type;
-  
-  inline explicit
-  partial_unwrap_check_fixed(const T1& A, const Mat<eT>& B)
-    : M_local( (&A == &B) ? new T1(A)  : nullptr )
-    , M      ( (&A == &B) ? (*M_local) : A       )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check_fixed()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  constexpr eT get_val() const { return eT(1); }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = false;
-  
-  const T1* M_local;
-  const T1& M;
-  };
-
-
-
-template<typename T1, bool condition>
-struct partial_unwrap_check_redirect {};
-
-template<typename T1>
-struct partial_unwrap_check_redirect<T1, false> { typedef partial_unwrap_check_default<T1> result; };
-
-template<typename T1>
-struct partial_unwrap_check_redirect<T1, true>  { typedef partial_unwrap_check_fixed<T1>   result; };
-
-template<typename T1>
-struct partial_unwrap_check : public partial_unwrap_check_redirect<T1, is_Mat_fixed<T1>::value>::result
-  {
-  typedef typename T1::elem_type eT;
-  
-  inline partial_unwrap_check(const T1& A, const Mat<eT>& B)
-    : partial_unwrap_check_redirect<T1, is_Mat_fixed<T1>::value>::result(A, B)
-    {
-    }
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< Mat<eT> >
-  {
-  typedef Mat<eT> stored_type;
-
-  inline
-  partial_unwrap_check(const Mat<eT>& A, const Mat<eT>& B)
-    : M_local ( (&A == &B) ? new Mat<eT>(A) : nullptr )
-    , M       ( (&A == &B) ? (*M_local)     : A       )
-    {
-    arma_debug_sigprint();
-    }
-  
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  constexpr eT get_val() const { return eT(1); }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = false;
-  
-  // the order below is important
-  const Mat<eT>* M_local;
-  const Mat<eT>& M;
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< Row<eT> >
-  {
-  typedef Row<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const Row<eT>& A, const Mat<eT>& B)
-    : M_local ( (&A == &B) ? new Row<eT>(A) : nullptr )
-    , M       ( (&A == &B) ? (*M_local)     : A       )
-    {
-    arma_debug_sigprint();
-    }
-  
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  constexpr eT get_val() const { return eT(1); }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = false;
-  
-  // the order below is important
-  const Row<eT>* M_local;
-  const Row<eT>& M;
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< Col<eT> >
-  {
-  typedef Col<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const Col<eT>& A, const Mat<eT>& B)
-    : M_local ( (&A == &B) ? new Col<eT>(A) : nullptr )
-    , M       ( (&A == &B) ? (*M_local)     : A       )
-    {
-    arma_debug_sigprint();
-    }
-  
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  constexpr eT get_val() const { return eT(1); }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = false;
-  
-  // the order below is important
-  const Col<eT>* M_local;
-  const Col<eT>& M;
-  };
-
-
-
-// NOTE: we can get away with this shortcut as the partial_unwrap_check class is only used by the glue_times class,
-// NOTE: which relies on partial_unwrap_check to check for aliasing
-template<typename eT>
-struct partial_unwrap_check< subview_col<eT> >
-  {
-  typedef Col<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const subview_col<eT>& A, const Mat<eT>& B)
-    : M  ( const_cast<eT*>( A.colmem ), A.n_rows, (&(A.m) == &B), false )
-    {
-    arma_debug_sigprint();
-    }
-  
-  constexpr eT get_val() const { return eT(1); }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = false;
-  
-  const Col<eT> M;
-  };
-
-
-
-template<typename T1>
-struct partial_unwrap_check_htrans_default
-  {
-  typedef typename T1::elem_type eT;
-  typedef Mat<eT>                stored_type;
-  
-  inline
-  partial_unwrap_check_htrans_default(const Op<T1, op_htrans>& A, const Mat<eT>&)
-    : M(A.m)
-    {
-    arma_debug_sigprint();
-    }
-  
-  constexpr eT get_val() const { return eT(1); }
-  
-  static constexpr bool do_trans = true;
-  static constexpr bool do_times = false;
-  
-  const Mat<eT> M;
-  };
-
-
-template<typename T1>
-struct partial_unwrap_check_htrans_fixed
-  {
-  typedef typename T1::elem_type eT;
-  typedef T1                     stored_type;
-  
-  inline explicit
-  partial_unwrap_check_htrans_fixed(const Op<T1, op_htrans>& A, const Mat<eT>& B)
-    : M_local( (&(A.m) == &B) ? new T1(A.m) : nullptr )
-    , M      ( (&(A.m) == &B) ? (*M_local)  : A.m     )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check_htrans_fixed()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  constexpr eT get_val() const { return eT(1); }
-  
-  static constexpr bool do_trans = true;
-  static constexpr bool do_times = false;
-  
-  const T1* M_local;
-  const T1& M;
-  };
-
-
-
-template<typename T1, bool condition>
-struct partial_unwrap_check_htrans_redirect {};
-
-template<typename T1>
-struct partial_unwrap_check_htrans_redirect<T1, false> { typedef partial_unwrap_check_htrans_default<T1> result; };
-
-template<typename T1>
-struct partial_unwrap_check_htrans_redirect<T1, true>  { typedef partial_unwrap_check_htrans_fixed<T1>   result; };
-
-
-template<typename T1>
-struct partial_unwrap_check< Op<T1, op_htrans> > : public partial_unwrap_check_htrans_redirect<T1, is_Mat_fixed<T1>::value>::result
-  {
-  typedef typename T1::elem_type eT;
-  
-  inline partial_unwrap_check(const Op<T1, op_htrans>& A, const Mat<eT>& B)
-    : partial_unwrap_check_htrans_redirect<T1, is_Mat_fixed<T1>::value>::result(A, B)
-    {
-    }
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< Op< Mat<eT>, op_htrans> >
-  {
-  typedef Mat<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const Op< Mat<eT>, op_htrans>& A, const Mat<eT>& B)
-    : M_local ( (&A.m == &B) ? new Mat<eT>(A.m) : nullptr )
-    , M       ( (&A.m == &B) ? (*M_local)       : A.m     )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  constexpr eT get_val() const { return eT(1); }
-  
-  static constexpr bool do_trans = true;
-  static constexpr bool do_times = false;
-  
-  // the order below is important
-  const Mat<eT>* M_local;
-  const Mat<eT>& M;
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< Op< Row<eT>, op_htrans> >
-  {
-  typedef Row<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const Op< Row<eT>, op_htrans>& A, const Mat<eT>& B)
-    : M_local ( (&A.m == &B) ? new Row<eT>(A.m) : nullptr )
-    , M       ( (&A.m == &B) ? (*M_local)       : A.m     )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  constexpr eT get_val() const { return eT(1); }
-  
-  static constexpr bool do_trans = true;
-  static constexpr bool do_times = false;
-  
-  // the order below is important
-  const Row<eT>* M_local;
-  const Row<eT>& M;
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< Op< Col<eT>, op_htrans> >
-  {
-  typedef Col<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const Op< Col<eT>, op_htrans>& A, const Mat<eT>& B)
-    : M_local ( (&A.m == &B) ? new Col<eT>(A.m) : nullptr )
-    , M       ( (&A.m == &B) ? (*M_local)       : A.m     )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  constexpr eT get_val() const { return eT(1); }
-  
-  static constexpr bool do_trans = true;
-  static constexpr bool do_times = false;
-  
-  // the order below is important
-  const Col<eT>* M_local;
-  const Col<eT>& M;
-  };
-
-
-
-// NOTE: we can get away with this shortcut as the partial_unwrap_check class is only used by the glue_times class,
-// NOTE: which relies on partial_unwrap_check to check for aliasing
-template<typename eT>
-struct partial_unwrap_check< Op< subview_col<eT>, op_htrans> >
-  {
-  typedef Col<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const Op< subview_col<eT>, op_htrans>& A, const Mat<eT>& B)
-    : M  ( const_cast<eT*>( A.m.colmem ), A.m.n_rows, (&(A.m.m) == &B), false )
-    {
-    arma_debug_sigprint();
-    }
-  
-  constexpr eT get_val() const { return eT(1); }
-  
-  static constexpr bool do_trans = true;
-  static constexpr bool do_times = false;
-  
-  const Col<eT> M;
-  };
-
-
-
-template<typename T1>
-struct partial_unwrap_check_htrans2_default
-  {
-  typedef typename T1::elem_type eT;
-  typedef Mat<eT>                stored_type;
-  
-  inline
-  partial_unwrap_check_htrans2_default(const Op<T1, op_htrans2>& A, const Mat<eT>&)
-    : val(A.aux)
-    , M  (A.m)
-    {
-    arma_debug_sigprint();
-    }
-  
-  arma_inline eT get_val() const { return val; }
-  
-  static constexpr bool do_trans = true;
-  static constexpr bool do_times = true;
-  
-  const eT      val;
-  const Mat<eT> M;
-  };
-
-
-
-template<typename T1>
-struct partial_unwrap_check_htrans2_fixed
-  {
-  typedef typename T1::elem_type eT;
-  typedef T1                     stored_type;
-  
-  inline explicit
-  partial_unwrap_check_htrans2_fixed(const Op<T1, op_htrans2>& A, const Mat<eT>& B)
-    : val    (A.aux)
-    , M_local( (&(A.m) == &B) ? new T1(A.m) : nullptr )
-    , M      ( (&(A.m) == &B) ? (*M_local)  : A.m     )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check_htrans2_fixed()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  arma_inline eT get_val() const { return val; }
-  
-  static constexpr bool do_trans = true;
-  static constexpr bool do_times = true;
-  
-  const eT  val;
-  const T1* M_local;
-  const T1& M;
-  };
-
-
-
-template<typename T1, bool condition>
-struct partial_unwrap_check_htrans2_redirect {};
-
-template<typename T1>
-struct partial_unwrap_check_htrans2_redirect<T1, false> { typedef partial_unwrap_check_htrans2_default<T1> result; };
-
-template<typename T1>
-struct partial_unwrap_check_htrans2_redirect<T1, true>  { typedef partial_unwrap_check_htrans2_fixed<T1>   result; };
-
-
-template<typename T1>
-struct partial_unwrap_check< Op<T1, op_htrans2> > : public partial_unwrap_check_htrans2_redirect<T1, is_Mat_fixed<T1>::value>::result
-  {
-  typedef typename T1::elem_type eT;
-  
-  inline partial_unwrap_check(const Op<T1, op_htrans2>& A, const Mat<eT>& B)
-    : partial_unwrap_check_htrans2_redirect<T1, is_Mat_fixed<T1>::value>::result(A, B)
-    {
-    }
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< Op< Mat<eT>, op_htrans2> >
-  {
-  typedef Mat<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const Op< Mat<eT>, op_htrans2>& A, const Mat<eT>& B)
-    : val     (A.aux)
-    , M_local ( (&A.m == &B) ? new Mat<eT>(A.m) : nullptr )
-    , M       ( (&A.m == &B) ? (*M_local)       : A.m     )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  arma_inline eT get_val() const { return val; }
-  
-  static constexpr bool do_trans = true;
-  static constexpr bool do_times = true;
-  
-  // the order below is important
-  const eT       val;
-  const Mat<eT>* M_local;
-  const Mat<eT>& M;
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< Op< Row<eT>, op_htrans2> >
-  {
-  typedef Row<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const Op< Row<eT>, op_htrans2>& A, const Mat<eT>& B)
-    : val     (A.aux)
-    , M_local ( (&A.m == &B) ? new Row<eT>(A.m) : nullptr )
-    , M       ( (&A.m == &B) ? (*M_local)       : A.m     )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  arma_inline eT get_val() const { return val; }
-  
-  static constexpr bool do_trans = true;
-  static constexpr bool do_times = true;
-  
-  // the order below is important
-  const eT       val;
-  const Row<eT>* M_local;
-  const Row<eT>& M;
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< Op< Col<eT>, op_htrans2> >
-  {
-  typedef Col<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const Op< Col<eT>, op_htrans2>& A, const Mat<eT>& B)
-    : val     (A.aux)
-    , M_local ( (&A.m == &B) ? new Col<eT>(A.m) : nullptr )
-    , M       ( (&A.m == &B) ? (*M_local)       : A.m     )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  arma_inline eT get_val() const { return val; }
-  
-  static constexpr bool do_trans = true;
-  static constexpr bool do_times = true;
-  
-  // the order below is important
-  const eT       val;
-  const Col<eT>* M_local;
-  const Col<eT>& M;
-  };
-
-
-
-// NOTE: we can get away with this shortcut as the partial_unwrap_check class is only used by the glue_times class,
-// NOTE: which relies on partial_unwrap_check to check for aliasing
-template<typename eT>
-struct partial_unwrap_check< Op< subview_col<eT>, op_htrans2> >
-  {
-  typedef Col<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const Op< subview_col<eT>, op_htrans2>& A, const Mat<eT>& B)
-    : val( A.aux )
-    , M  ( const_cast<eT*>( A.m.colmem ), A.m.n_rows, (&(A.m.m) == &B), false )
-    {
-    arma_debug_sigprint();
-    }
-  
-  arma_inline eT get_val() const { return val; }
-  
-  static constexpr bool do_trans = true;
-  static constexpr bool do_times = true;
-  
-  const eT      val;
-  const Col<eT> M;
-  };
-
-
-
-template<typename T1>
-struct partial_unwrap_check_scalar_times_default
-  {
-  typedef typename T1::elem_type eT;
-  typedef Mat<eT>                stored_type;
-  
-  inline
-  partial_unwrap_check_scalar_times_default(const eOp<T1, eop_scalar_times>& A, const Mat<eT>&)
-    : val(A.aux)
-    , M  (A.P.Q)
-    {
-    arma_debug_sigprint();
-    }
-  
-  arma_inline eT get_val() const { return val; }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = true;
-  
-  const eT      val;
-  const Mat<eT> M;
-  };
-
-
-
-template<typename T1>
-struct partial_unwrap_check_scalar_times_fixed
-  {
-  typedef typename T1::elem_type eT;
-  typedef T1                     stored_type;
-  
-  inline explicit
-  partial_unwrap_check_scalar_times_fixed(const eOp<T1, eop_scalar_times>& A, const Mat<eT>& B)
-    : val    ( A.aux )
-    , M_local( (&(A.P.Q) == &B) ? new T1(A.P.Q) : nullptr )
-    , M      ( (&(A.P.Q) == &B) ? (*M_local)    : A.P.Q   )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check_scalar_times_fixed()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  arma_inline eT get_val() const { return val; }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = true;
-  
-  const eT  val;
-  const T1* M_local;
-  const T1& M;
-  };
-
-
-
-template<typename T1, bool condition>
-struct partial_unwrap_check_scalar_times_redirect {};
-
-template<typename T1>
-struct partial_unwrap_check_scalar_times_redirect<T1, false> { typedef partial_unwrap_check_scalar_times_default<T1> result; };
-
-template<typename T1>
-struct partial_unwrap_check_scalar_times_redirect<T1, true>  { typedef partial_unwrap_check_scalar_times_fixed<T1>   result; };
-
-
-template<typename T1>
-struct partial_unwrap_check< eOp<T1, eop_scalar_times> > : public partial_unwrap_check_scalar_times_redirect<T1, is_Mat_fixed<T1>::value>::result
-  {
-  typedef typename T1::elem_type eT;
-  
-  inline partial_unwrap_check(const eOp<T1, eop_scalar_times>& A, const Mat<eT>& B)
-    : partial_unwrap_check_scalar_times_redirect<T1, is_Mat_fixed<T1>::value>::result(A, B)
-    {
-    }
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< eOp<Mat<eT>, eop_scalar_times> >
-  {
-  typedef Mat<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const eOp<Mat<eT>,eop_scalar_times>& A, const Mat<eT>& B)
-    : val    (A.aux)
-    , M_local( (&(A.P.Q) == &B) ? new Mat<eT>(A.P.Q) : nullptr )
-    , M      ( (&(A.P.Q) == &B) ? *M_local           : A.P.Q   )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  arma_inline eT get_val() const { return val; }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = true;
-  
-  const eT       val;
-  const Mat<eT>* M_local;
-  const Mat<eT>& M;
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< eOp<Row<eT>, eop_scalar_times> >
-  {
-  typedef Row<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const eOp<Row<eT>,eop_scalar_times>& A, const Mat<eT>& B)
-    : val(A.aux)
-    , M_local( (&(A.P.Q) == &B) ? new Row<eT>(A.P.Q) : nullptr )
-    , M      ( (&(A.P.Q) == &B) ? *M_local           : A.P.Q   )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  arma_inline eT get_val() const { return val; }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = true;
-  
-  const eT       val;
-  const Row<eT>* M_local;
-  const Row<eT>& M;
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< eOp<Col<eT>, eop_scalar_times> >
-  {
-  typedef Col<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const eOp<Col<eT>,eop_scalar_times>& A, const Mat<eT>& B)
-    : val    ( A.aux )
-    , M_local( (&(A.P.Q) == &B) ? new Col<eT>(A.P.Q) : nullptr )
-    , M      ( (&(A.P.Q) == &B) ? *M_local           : A.P.Q   )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  arma_inline eT get_val() const { return val; }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = true;
-  
-  const eT       val;
-  const Col<eT>* M_local;
-  const Col<eT>& M;
-  };
-
-
-
-// NOTE: we can get away with this shortcut as the partial_unwrap_check class is only used by the glue_times class,
-// NOTE: which relies on partial_unwrap_check to check for aliasing
-template<typename eT>
-struct partial_unwrap_check< eOp<subview_col<eT>, eop_scalar_times> >
-  {
-  typedef Col<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const eOp<subview_col<eT>,eop_scalar_times>& A, const Mat<eT>& B)
-    : val( A.aux )
-    , M  ( const_cast<eT*>( A.P.Q.colmem ), A.P.Q.n_rows, (&(A.P.Q.m) == &B), false )
-    {
-    arma_debug_sigprint();
-    }
-  
-  arma_inline eT get_val() const { return val; }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = true;
-  
-  const eT      val;
-  const Col<eT> M;
-  };
-
-
-
-template<typename T1>
-struct partial_unwrap_check_neg_default
-  {
-  typedef typename T1::elem_type eT;
-  typedef Mat<eT>                stored_type;
-  
-  inline
-  partial_unwrap_check_neg_default(const eOp<T1, eop_neg>& A, const Mat<eT>&)
-    : M(A.P.Q)
-    {
-    arma_debug_sigprint();
-    }
-  
-  constexpr eT get_val() const { return eT(-1); }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = true;
-  
-  const Mat<eT> M;
-  };
-
-
-
-template<typename T1>
-struct partial_unwrap_check_neg_fixed
-  {
-  typedef typename T1::elem_type eT;
-  typedef T1                     stored_type;
-  
-  inline explicit
-  partial_unwrap_check_neg_fixed(const eOp<T1, eop_neg>& A, const Mat<eT>& B)
-    : M_local( (&(A.P.Q) == &B) ? new T1(A.P.Q) : nullptr )
-    , M      ( (&(A.P.Q) == &B) ? (*M_local)    : A.P.Q   )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check_neg_fixed()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  constexpr eT get_val() const { return eT(-1); }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = true;
-  
-  const T1* M_local;
-  const T1& M;
-  };
-
-
-
-template<typename T1, bool condition>
-struct partial_unwrap_check_neg_redirect {};
-
-template<typename T1>
-struct partial_unwrap_check_neg_redirect<T1, false> { typedef partial_unwrap_check_neg_default<T1> result; };
-
-template<typename T1>
-struct partial_unwrap_check_neg_redirect<T1, true>  { typedef partial_unwrap_check_neg_fixed<T1>   result; };
-
-
-template<typename T1>
-struct partial_unwrap_check< eOp<T1, eop_neg> > : public partial_unwrap_check_neg_redirect<T1, is_Mat_fixed<T1>::value>::result
-  {
-  typedef typename T1::elem_type eT;
-  
-  inline partial_unwrap_check(const eOp<T1, eop_neg>& A, const Mat<eT>& B)
-    : partial_unwrap_check_neg_redirect<T1, is_Mat_fixed<T1>::value>::result(A, B)
-    {
-    }
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< eOp<Mat<eT>, eop_neg> >
-  {
-  typedef Mat<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const eOp<Mat<eT>,eop_neg>& A, const Mat<eT>& B)
-    : M_local( (&(A.P.Q) == &B) ? new Mat<eT>(A.P.Q) : nullptr )
-    , M      ( (&(A.P.Q) == &B) ? *M_local           : A.P.Q   )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  constexpr eT get_val() const { return eT(-1); }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = true;
-  
-  const Mat<eT>* M_local;
-  const Mat<eT>& M;
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< eOp<Row<eT>, eop_neg> >
-  {
-  typedef Row<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const eOp<Row<eT>,eop_neg>& A, const Mat<eT>& B)
-    : M_local( (&(A.P.Q) == &B) ? new Row<eT>(A.P.Q) : nullptr )
-    , M      ( (&(A.P.Q) == &B) ? *M_local           : A.P.Q   )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  constexpr eT get_val() const { return eT(-1); }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = true;
-  
-  const Row<eT>* M_local;
-  const Row<eT>& M;
-  };
-
-
-
-template<typename eT>
-struct partial_unwrap_check< eOp<Col<eT>, eop_neg> >
-  {
-  typedef Col<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const eOp<Col<eT>,eop_neg>& A, const Mat<eT>& B)
-    : M_local( (&(A.P.Q) == &B) ? new Col<eT>(A.P.Q) : nullptr )
-    , M      ( (&(A.P.Q) == &B) ? *M_local           : A.P.Q   )
-    {
-    arma_debug_sigprint();
-    }
-  
-  inline
-  ~partial_unwrap_check()
-    {
-    arma_debug_sigprint();
-    
-    if(M_local) { delete M_local; }
-    }
-  
-  constexpr eT get_val() const { return eT(-1); }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = true;
-  
-  const Col<eT>* M_local;
-  const Col<eT>& M;
-  };
-
-
-
-// NOTE: we can get away with this shortcut as the partial_unwrap_check class is only used by the glue_times class,
-// NOTE: which relies on partial_unwrap_check to check for aliasing
-template<typename eT>
-struct partial_unwrap_check< eOp<subview_col<eT>, eop_neg> >
-  {
-  typedef Col<eT> stored_type;
-  
-  inline
-  partial_unwrap_check(const eOp<subview_col<eT>,eop_neg>& A, const Mat<eT>& B)
-    : M  ( const_cast<eT*>( A.P.Q.colmem ), A.P.Q.n_rows, (&(A.P.Q.m) == &B), false )
-    {
-    arma_debug_sigprint();
-    }
-  
-  constexpr eT get_val() const { return eT(-1); }
-  
-  static constexpr bool do_trans = false;
-  static constexpr bool do_times = true;
-  
-  const Col<eT> M;
-  };
-
-
-
 //
 //
 //