diff --git a/include/armadillo_bits/subview_elem1_meat.hpp b/include/armadillo_bits/subview_elem1_meat.hpp
index 4f930e8a..579525b2 100644
--- a/include/armadillo_bits/subview_elem1_meat.hpp
+++ b/include/armadillo_bits/subview_elem1_meat.hpp
@@ -64,8 +64,8 @@ subview_elem1<eT,T1>::inplace_op(const eT val)
         eT*   m_mem    = m_local.memptr();
   const uword m_n_elem = m_local.n_elem;
   
-  const unwrap_check_mixed<T1> tmp(a.get_ref(), m_local);
-  const umat& aa = tmp.M;
+  const unwrap_check_mixed<T1> U(a.get_ref(), m_local);
+  const umat& aa = U.M;
   
   if(resolves_to_vector<T1>::no)
     {
@@ -119,8 +119,8 @@ subview_elem1<eT,T1>::inplace_op(const Base<eT,T2>& x)
         eT*   m_mem    = m_local.memptr();
   const uword m_n_elem = m_local.n_elem;
   
-  const unwrap_check_mixed<T1> aa_tmp(a.get_ref(), m_local);
-  const umat& aa = aa_tmp.M;
+  const unwrap_check_mixed<T1> U(a.get_ref(), m_local);
+  const umat& aa = U.M;
   
   if(resolves_to_vector<T1>::no)
     {
@@ -256,8 +256,8 @@ subview_elem1<eT,T1>::replace(const eT old_val, const eT new_val)
         eT*   m_mem    = m_local.memptr();
   const uword m_n_elem = m_local.n_elem;
   
-  const unwrap_check_mixed<T1> tmp(a.get_ref(), m_local);
-  const umat& aa = tmp.M;
+  const unwrap_check_mixed<T1> U(a.get_ref(), m_local);
+  const umat& aa = U.M;
   
   if(resolves_to_vector<T1>::no)
     {
@@ -606,8 +606,8 @@ subview_elem1<eT,T1>::extract_noalias(Mat<eT>& out, const subview_elem1<eT,T1>&
   {
   arma_debug_sigprint();
   
-  const quasi_unwrap<T1> tmp1(in.a.get_ref());
-  const umat& aa = tmp1.M;
+  const quasi_unwrap<T1> U(in.a.get_ref());
+  const umat& aa = U.M;
   
   if(resolves_to_vector<T1>::no)
     {
@@ -655,8 +655,8 @@ subview_elem1<eT,T1>::extract(Mat<eT>& actual_out, const subview_elem1<eT,T1>& i
   {
   arma_debug_sigprint();
   
-  const unwrap_check_mixed<T1> tmp1(in.a.get_ref(), actual_out);
-  const umat& aa = tmp1.M;
+  const unwrap_check_mixed<T1> U(in.a.get_ref(), actual_out);
+  const umat& aa = U.M;
   
   if(resolves_to_vector<T1>::no)
     {
diff --git a/include/armadillo_bits/subview_elem2_meat.hpp b/include/armadillo_bits/subview_elem2_meat.hpp
index 58b6937a..c2e6a06d 100644
--- a/include/armadillo_bits/subview_elem2_meat.hpp
+++ b/include/armadillo_bits/subview_elem2_meat.hpp
@@ -64,11 +64,11 @@ subview_elem2<eT,T1,T2>::inplace_op(const eT val)
   
   if( (all_rows == false) && (all_cols == false) )
     {
-    const unwrap_check_mixed<T1> tmp1(base_ri.get_ref(), m_local);
-    const unwrap_check_mixed<T2> tmp2(base_ci.get_ref(), m_local);
+    const unwrap_check_mixed<T1> U1(base_ri.get_ref(), m_local);
+    const unwrap_check_mixed<T2> U2(base_ci.get_ref(), m_local);
     
-    const umat& ri = tmp1.M;
-    const umat& ci = tmp2.M;
+    const umat& ri = U1.M;
+    const umat& ci = U2.M;
     
     arma_conform_check
       (
@@ -105,9 +105,9 @@ subview_elem2<eT,T1,T2>::inplace_op(const eT val)
   else
   if( (all_rows == true) && (all_cols == false) )
     {
-    const unwrap_check_mixed<T2> tmp2(base_ci.get_ref(), m_local);
+    const unwrap_check_mixed<T2> U2(base_ci.get_ref(), m_local);
     
-    const umat& ci = tmp2.M;
+    const umat& ci = U2.M;
     
     arma_conform_check
       (
@@ -136,9 +136,9 @@ subview_elem2<eT,T1,T2>::inplace_op(const eT val)
   else
   if( (all_rows == false) && (all_cols == true) )
     {
-    const unwrap_check_mixed<T1> tmp1(base_ri.get_ref(), m_local);
+    const unwrap_check_mixed<T1> U1(base_ri.get_ref(), m_local);
     
-    const umat& ri = tmp1.M;
+    const umat& ri = U1.M;
     
     arma_conform_check
       (
@@ -182,16 +182,16 @@ subview_elem2<eT,T1,T2>::inplace_op(const Base<eT,expr>& x)
   const uword m_n_rows = m_local.n_rows;
   const uword m_n_cols = m_local.n_cols;
   
-  const unwrap_check<expr> tmp(x.get_ref(), m_local);
-  const Mat<eT>& X       = tmp.M;
+  const unwrap_check<expr> U(x.get_ref(), m_local);
+  const Mat<eT>& X       = U.M;
   
   if( (all_rows == false) && (all_cols == false) )
     {
-    const unwrap_check_mixed<T1> tmp1(base_ri.get_ref(), m_local);
-    const unwrap_check_mixed<T2> tmp2(base_ci.get_ref(), m_local);
+    const unwrap_check_mixed<T1> U1(base_ri.get_ref(), m_local);
+    const unwrap_check_mixed<T2> U2(base_ci.get_ref(), m_local);
     
-    const umat& ri = tmp1.M;
-    const umat& ci = tmp2.M;
+    const umat& ri = U1.M;
+    const umat& ci = U2.M;
     
     arma_conform_check
       (
@@ -230,9 +230,9 @@ subview_elem2<eT,T1,T2>::inplace_op(const Base<eT,expr>& x)
   else
   if( (all_rows == true) && (all_cols == false) )
     {
-    const unwrap_check_mixed<T2> tmp2(base_ci.get_ref(), m_local);
+    const unwrap_check_mixed<T2> U2(base_ci.get_ref(), m_local);
     
-    const umat& ci = tmp2.M;
+    const umat& ci = U2.M;
     
     arma_conform_check
       (
@@ -264,9 +264,9 @@ subview_elem2<eT,T1,T2>::inplace_op(const Base<eT,expr>& x)
   else
   if( (all_rows == false) && (all_cols == true) )
     {
-    const unwrap_check_mixed<T1> tmp1(base_ri.get_ref(), m_local);
+    const unwrap_check_mixed<T1> U1(base_ri.get_ref(), m_local);
     
-    const umat& ri = tmp1.M;
+    const umat& ri = U1.M;
     
     arma_conform_check
       (
@@ -868,11 +868,11 @@ subview_elem2<eT,T1,T2>::extract_noalias(Mat<eT>& out, const subview_elem2<eT,T1
   
   if( (in.all_rows == false) && (in.all_cols == false) )
     {
-    const quasi_unwrap<T1> tmp1(in.base_ri.get_ref());
-    const quasi_unwrap<T2> tmp2(in.base_ci.get_ref());
+    const quasi_unwrap<T1> U1(in.base_ri.get_ref());
+    const quasi_unwrap<T2> U2(in.base_ci.get_ref());
     
-    const umat& ri = tmp1.M;
-    const umat& ci = tmp2.M;
+    const umat& ri = U1.M;
+    const umat& ci = U2.M;
     
     arma_conform_check
       (
@@ -911,9 +911,9 @@ subview_elem2<eT,T1,T2>::extract_noalias(Mat<eT>& out, const subview_elem2<eT,T1
   else
   if( (in.all_rows == true) && (in.all_cols == false) )
     {
-    const quasi_unwrap<T2> tmp2(in.base_ci.get_ref());
+    const quasi_unwrap<T2> U2(in.base_ci.get_ref());
     
-    const umat& ci = tmp2.M;
+    const umat& ci = U2.M;
     
     arma_conform_check
       (
@@ -938,9 +938,9 @@ subview_elem2<eT,T1,T2>::extract_noalias(Mat<eT>& out, const subview_elem2<eT,T1
   else
   if( (in.all_rows == false) && (in.all_cols == true) )
     {
-    const quasi_unwrap<T1> tmp1(in.base_ri.get_ref());
+    const quasi_unwrap<T1> U1(in.base_ri.get_ref());
     
-    const umat& ri = tmp1.M;
+    const umat& ri = U1.M;
     
     arma_conform_check
       (
@@ -990,11 +990,11 @@ subview_elem2<eT,T1,T2>::extract(Mat<eT>& actual_out, const subview_elem2<eT,T1,
   
   if( (in.all_rows == false) && (in.all_cols == false) )
     {
-    const unwrap_check_mixed<T1> tmp1(in.base_ri.get_ref(), actual_out);
-    const unwrap_check_mixed<T2> tmp2(in.base_ci.get_ref(), actual_out);
+    const unwrap_check_mixed<T1> U1(in.base_ri.get_ref(), actual_out);
+    const unwrap_check_mixed<T2> U2(in.base_ci.get_ref(), actual_out);
     
-    const umat& ri = tmp1.M;
-    const umat& ci = tmp2.M;
+    const umat& ri = U1.M;
+    const umat& ci = U2.M;
     
     arma_conform_check
       (
@@ -1033,9 +1033,9 @@ subview_elem2<eT,T1,T2>::extract(Mat<eT>& actual_out, const subview_elem2<eT,T1,
   else
   if( (in.all_rows == true) && (in.all_cols == false) )
     {
-    const unwrap_check_mixed<T2> tmp2(in.base_ci.get_ref(), m);
+    const unwrap_check_mixed<T2> U2(in.base_ci.get_ref(), m);
     
-    const umat& ci = tmp2.M;
+    const umat& ci = U2.M;
     
     arma_conform_check
       (
@@ -1060,9 +1060,9 @@ subview_elem2<eT,T1,T2>::extract(Mat<eT>& actual_out, const subview_elem2<eT,T1,
   else
   if( (in.all_rows == false) && (in.all_cols == true) )
     {
-    const unwrap_check_mixed<T1> tmp1(in.base_ri.get_ref(), m);
+    const unwrap_check_mixed<T1> U1(in.base_ri.get_ref(), m);
     
-    const umat& ri = tmp1.M;
+    const umat& ri = U1.M;
     
     arma_conform_check
       (