diff --git a/vtkm/cont/internal/ArrayHandleExecutionManager.h b/vtkm/cont/internal/ArrayHandleExecutionManager.h
index 01528facd..cc6e25248 100644
--- a/vtkm/cont/internal/ArrayHandleExecutionManager.h
+++ b/vtkm/cont/internal/ArrayHandleExecutionManager.h
@@ -73,7 +73,7 @@ public:
   /// arrays, then this method may save the iterators to be returned in the \c
   /// GetPortalConst methods.
   ///
-  virtual void LoadDataForInput(cosnt PortalConstControl& portal) = 0;
+  virtual void LoadDataForInput(const PortalConstControl& portal) = 0;
 
   /// Allocates a large enough array in the execution environment and copies
   /// the given data to that array. The allocated array can later be accessed
diff --git a/vtkm/cont/internal/ArrayPortalShrink.h b/vtkm/cont/internal/ArrayPortalShrink.h
index 5484e3af1..16d109b57 100644
--- a/vtkm/cont/internal/ArrayPortalShrink.h
+++ b/vtkm/cont/internal/ArrayPortalShrink.h
@@ -77,7 +77,7 @@ public:
   }
 
   VTKM_CONT_EXPORT
-  void Set(vtkm::Id index, ValueType value) const
+  void Set(vtkm::Id index, const ValueType& value) const
   {
     VTKM_ASSERT_CONT(index >= 0);
     VTKM_ASSERT_CONT(index < this->GetNumberOfValues());
diff --git a/vtkm/cont/internal/IteratorFromArrayPortal.h b/vtkm/cont/internal/IteratorFromArrayPortal.h
index f8610a946..8dca771b5 100644
--- a/vtkm/cont/internal/IteratorFromArrayPortal.h
+++ b/vtkm/cont/internal/IteratorFromArrayPortal.h
@@ -60,7 +60,7 @@ struct IteratorFromArrayPortalValue
   }
 
   VTKM_CONT_EXPORT
-  ValueType operator=(ValueType value)
+  ValueType operator=(const ValueType& value)
   {
     this->Portal.Set(this->Index, value);
     return value;
diff --git a/vtkm/cont/internal/testing/UnitTestArrayManagerExecutionShareWithControl.cxx b/vtkm/cont/internal/testing/UnitTestArrayManagerExecutionShareWithControl.cxx
index a3f5ed1ad..101b29b51 100644
--- a/vtkm/cont/internal/testing/UnitTestArrayManagerExecutionShareWithControl.cxx
+++ b/vtkm/cont/internal/testing/UnitTestArrayManagerExecutionShareWithControl.cxx
@@ -40,7 +40,7 @@ struct TemplatedTests
   typedef vtkm::cont::internal::ArrayContainerControl<
       T, vtkm::cont::ArrayContainerControlTagBasic> ArrayContainerType;
 
-  void SetContainer(ArrayContainerType &array, ValueType value)
+  void SetContainer(ArrayContainerType &array, const ValueType& value)
   {
     std::fill(array.GetPortal().GetIteratorBegin(),
               array.GetPortal().GetIteratorEnd(),
@@ -48,7 +48,7 @@ struct TemplatedTests
   }
 
   template <class IteratorType>
-  bool CheckArray(IteratorType begin, IteratorType end, ValueType value)
+  bool CheckArray(IteratorType begin, IteratorType end, const ValueType& value)
   {
     for (IteratorType iter = begin; iter != end; iter++)
     {
@@ -57,7 +57,7 @@ struct TemplatedTests
     return true;
   }
 
-  bool CheckContainer(ArrayContainerType &array, ValueType value)
+  bool CheckContainer(ArrayContainerType &array, const ValueType& value)
   {
     return CheckArray(array.GetPortalConst().GetIteratorBegin(),
                       array.GetPortalConst().GetIteratorEnd(),
diff --git a/vtkm/cont/testing/UnitTestArrayContainerControlBasic.cxx b/vtkm/cont/testing/UnitTestArrayContainerControlBasic.cxx
index dd4213d5c..c213072a7 100644
--- a/vtkm/cont/testing/UnitTestArrayContainerControlBasic.cxx
+++ b/vtkm/cont/testing/UnitTestArrayContainerControlBasic.cxx
@@ -38,7 +38,7 @@ struct TemplatedTests
   typedef typename ArrayContainerType::PortalType PortalType;
   typedef typename PortalType::IteratorType IteratorType;
 
-  void SetContainer(ArrayContainerType &array, ValueType value)
+  void SetContainer(ArrayContainerType &array, const ValueType& value)
   {
     for (IteratorType iter = array.GetPortal().GetIteratorBegin();
          iter != array.GetPortal().GetIteratorEnd();