diff --git a/vtkm/filter/Filter.h b/vtkm/filter/Filter.h
index a7f021097..53d34c3c7 100644
--- a/vtkm/filter/Filter.h
+++ b/vtkm/filter/Filter.h
@@ -243,7 +243,7 @@ public:
 
   template <typename DerivedPolicy>
   VTKM_CONT vtkm::cont::DataSet Execute(const vtkm::cont::DataSet& input,
-                                        const vtkm::filter::PolicyBase<DerivedPolicy>& policy);
+                                        vtkm::filter::PolicyBase<DerivedPolicy> policy);
   //@}
 
   //@{
@@ -253,9 +253,8 @@ public:
   VTKM_CONT vtkm::cont::PartitionedDataSet Execute(const vtkm::cont::PartitionedDataSet& input);
 
   template <typename DerivedPolicy>
-  VTKM_CONT vtkm::cont::PartitionedDataSet Execute(
-    const vtkm::cont::PartitionedDataSet& input,
-    const vtkm::filter::PolicyBase<DerivedPolicy>& policy);
+  VTKM_CONT vtkm::cont::PartitionedDataSet Execute(const vtkm::cont::PartitionedDataSet& input,
+                                                   vtkm::filter::PolicyBase<DerivedPolicy> policy);
   //@}
 
   /// Map fields from input dataset to output.
@@ -264,7 +263,7 @@ public:
   template <typename DerivedPolicy>
   VTKM_CONT void MapFieldsToPass(const vtkm::cont::DataSet& input,
                                  vtkm::cont::DataSet& output,
-                                 const vtkm::filter::PolicyBase<DerivedPolicy>& policy);
+                                 vtkm::filter::PolicyBase<DerivedPolicy> policy);
 
   /// Specify the vtkm::cont::Invoker to be used to execute worklets by
   /// this filter instance. Overriding the default allows callers to control
diff --git a/vtkm/filter/Filter.hxx b/vtkm/filter/Filter.hxx
index 3dc0ae7ff..e39a56137 100644
--- a/vtkm/filter/Filter.hxx
+++ b/vtkm/filter/Filter.hxx
@@ -147,7 +147,7 @@ template <typename Derived, typename DerivedPolicy>
 void CallMapFieldOntoOutput(Derived* self,
                             const vtkm::cont::DataSet& input,
                             vtkm::cont::DataSet& output,
-                            const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
+                            vtkm::filter::PolicyBase<DerivedPolicy> policy)
 {
   using call_supported_t = typename SupportsMapFieldOntoOutput<Derived, DerivedPolicy>::type;
   CallMapFieldOntoOutputInternal(call_supported_t(), self, input, output, policy);
@@ -266,7 +266,7 @@ template <typename Derived>
 template <typename DerivedPolicy>
 inline VTKM_CONT vtkm::cont::DataSet Filter<Derived>::Execute(
   const vtkm::cont::DataSet& input,
-  const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
+  vtkm::filter::PolicyBase<DerivedPolicy> policy)
 {
   VTKM_LOG_SCOPE(
     vtkm::cont::LogLevel::Perf, "Filter: '%s'", vtkm::cont::TypeToString<Derived>().c_str());
@@ -286,7 +286,7 @@ template <typename Derived>
 template <typename DerivedPolicy>
 inline VTKM_CONT vtkm::cont::PartitionedDataSet Filter<Derived>::Execute(
   const vtkm::cont::PartitionedDataSet& input,
-  const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
+  vtkm::filter::PolicyBase<DerivedPolicy> policy)
 {
   VTKM_LOG_SCOPE(vtkm::cont::LogLevel::Perf,
                  "Filter (PartitionedDataSet): '%s'",
@@ -311,7 +311,7 @@ template <typename DerivedPolicy>
 inline VTKM_CONT void Filter<Derived>::MapFieldsToPass(
   const vtkm::cont::DataSet& input,
   vtkm::cont::DataSet& output,
-  const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
+  vtkm::filter::PolicyBase<DerivedPolicy> policy)
 {
   Derived* self = static_cast<Derived*>(this);
   for (vtkm::IdComponent cc = 0; cc < input.GetNumberOfFields(); ++cc)
diff --git a/vtkm/filter/FilterDataSet.h b/vtkm/filter/FilterDataSet.h
index 17acbbfb1..318c38e5b 100644
--- a/vtkm/filter/FilterDataSet.h
+++ b/vtkm/filter/FilterDataSet.h
@@ -51,12 +51,11 @@ public:
   template <typename DerivedPolicy>
   VTKM_CONT bool MapFieldOntoOutput(vtkm::cont::DataSet& result,
                                     const vtkm::cont::Field& field,
-                                    const vtkm::filter::PolicyBase<DerivedPolicy>& policy);
+                                    vtkm::filter::PolicyBase<DerivedPolicy> policy);
 
   template <typename DerivedPolicy>
-  VTKM_CONT vtkm::cont::DataSet PrepareForExecution(
-    const vtkm::cont::DataSet& input,
-    const vtkm::filter::PolicyBase<DerivedPolicy>& policy);
+  VTKM_CONT vtkm::cont::DataSet PrepareForExecution(const vtkm::cont::DataSet& input,
+                                                    vtkm::filter::PolicyBase<DerivedPolicy> policy);
 
 private:
   vtkm::Id CoordinateSystemIndex;
diff --git a/vtkm/filter/FilterDataSet.hxx b/vtkm/filter/FilterDataSet.hxx
index 726300e55..732240c13 100644
--- a/vtkm/filter/FilterDataSet.hxx
+++ b/vtkm/filter/FilterDataSet.hxx
@@ -38,7 +38,7 @@ template <typename Derived>
 template <typename DerivedPolicy>
 inline VTKM_CONT vtkm::cont::DataSet FilterDataSet<Derived>::PrepareForExecution(
   const vtkm::cont::DataSet& input,
-  const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
+  vtkm::filter::PolicyBase<DerivedPolicy> policy)
 {
   return (static_cast<Derived*>(this))->DoExecute(input, policy);
 }
@@ -49,7 +49,7 @@ template <typename DerivedPolicy>
 inline VTKM_CONT bool FilterDataSet<Derived>::MapFieldOntoOutput(
   vtkm::cont::DataSet& result,
   const vtkm::cont::Field& field,
-  const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
+  vtkm::filter::PolicyBase<DerivedPolicy> policy)
 {
   bool valid = false;
 
diff --git a/vtkm/filter/FilterDataSetWithField.h b/vtkm/filter/FilterDataSetWithField.h
index 2d56bcecc..2408b80aa 100644
--- a/vtkm/filter/FilterDataSetWithField.h
+++ b/vtkm/filter/FilterDataSetWithField.h
@@ -77,26 +77,23 @@ public:
   template <typename DerivedPolicy>
   VTKM_CONT bool MapFieldOntoOutput(vtkm::cont::DataSet& result,
                                     const vtkm::cont::Field& field,
-                                    const vtkm::filter::PolicyBase<DerivedPolicy>& policy);
+                                    vtkm::filter::PolicyBase<DerivedPolicy> policy);
 
   template <typename DerivedPolicy>
-  VTKM_CONT vtkm::cont::DataSet PrepareForExecution(
-    const vtkm::cont::DataSet& input,
-    const vtkm::filter::PolicyBase<DerivedPolicy>& policy);
+  VTKM_CONT vtkm::cont::DataSet PrepareForExecution(const vtkm::cont::DataSet& input,
+                                                    vtkm::filter::PolicyBase<DerivedPolicy> policy);
 
 private:
   template <typename DerivedPolicy>
-  VTKM_CONT vtkm::cont::DataSet PrepareForExecution(
-    const vtkm::cont::DataSet& input,
-    const vtkm::cont::Field& field,
-    const vtkm::filter::PolicyBase<DerivedPolicy>& policy);
+  VTKM_CONT vtkm::cont::DataSet PrepareForExecution(const vtkm::cont::DataSet& input,
+                                                    const vtkm::cont::Field& field,
+                                                    vtkm::filter::PolicyBase<DerivedPolicy> policy);
 
   //How do we specify float/double coordinate types?
   template <typename DerivedPolicy>
-  VTKM_CONT vtkm::cont::DataSet PrepareForExecution(
-    const vtkm::cont::DataSet& input,
-    const vtkm::cont::CoordinateSystem& field,
-    const vtkm::filter::PolicyBase<DerivedPolicy>& policy);
+  VTKM_CONT vtkm::cont::DataSet PrepareForExecution(const vtkm::cont::DataSet& input,
+                                                    const vtkm::cont::CoordinateSystem& field,
+                                                    vtkm::filter::PolicyBase<DerivedPolicy> policy);
 
   std::string OutputFieldName;
   vtkm::Id CoordinateSystemIndex;
diff --git a/vtkm/filter/FilterDataSetWithField.hxx b/vtkm/filter/FilterDataSetWithField.hxx
index 5ec5cc7b1..720fde887 100644
--- a/vtkm/filter/FilterDataSetWithField.hxx
+++ b/vtkm/filter/FilterDataSetWithField.hxx
@@ -49,7 +49,7 @@ template <typename Derived>
 template <typename DerivedPolicy>
 inline VTKM_CONT vtkm::cont::DataSet FilterDataSetWithField<Derived>::PrepareForExecution(
   const vtkm::cont::DataSet& input,
-  const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
+  vtkm::filter::PolicyBase<DerivedPolicy> policy)
 {
   if (this->UseCoordinateSystemAsField)
   {
@@ -70,7 +70,7 @@ template <typename DerivedPolicy>
 inline VTKM_CONT vtkm::cont::DataSet FilterDataSetWithField<Derived>::PrepareForExecution(
   const vtkm::cont::DataSet& input,
   const vtkm::cont::Field& field,
-  const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
+  vtkm::filter::PolicyBase<DerivedPolicy> policy)
 {
   vtkm::filter::FieldMetadata metaData(field);
   vtkm::cont::DataSet result;
@@ -92,7 +92,7 @@ template <typename DerivedPolicy>
 inline VTKM_CONT vtkm::cont::DataSet FilterDataSetWithField<Derived>::PrepareForExecution(
   const vtkm::cont::DataSet& input,
   const vtkm::cont::CoordinateSystem& field,
-  const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
+  vtkm::filter::PolicyBase<DerivedPolicy> policy)
 {
   //We have a special signature just for CoordinateSystem, so that we can ask
   //the policy for the storage types and value types just for coordinate systems
@@ -122,7 +122,7 @@ template <typename DerivedPolicy>
 inline VTKM_CONT bool FilterDataSetWithField<Derived>::MapFieldOntoOutput(
   vtkm::cont::DataSet& result,
   const vtkm::cont::Field& field,
-  const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
+  vtkm::filter::PolicyBase<DerivedPolicy> policy)
 {
   bool valid = false;
 
diff --git a/vtkm/filter/FilterField.h b/vtkm/filter/FilterField.h
index e007e6fad..f056148a0 100644
--- a/vtkm/filter/FilterField.h
+++ b/vtkm/filter/FilterField.h
@@ -83,21 +83,18 @@ public:
   //@{
   /// These are provided to satisfy the Filter API requirements.
   template <typename DerivedPolicy>
-  VTKM_CONT vtkm::cont::DataSet PrepareForExecution(
-    const vtkm::cont::DataSet& input,
-    const vtkm::filter::PolicyBase<DerivedPolicy>& policy);
+  VTKM_CONT vtkm::cont::DataSet PrepareForExecution(const vtkm::cont::DataSet& input,
+                                                    vtkm::filter::PolicyBase<DerivedPolicy> policy);
 
   template <typename DerivedPolicy>
-  VTKM_CONT vtkm::cont::DataSet PrepareForExecution(
-    const vtkm::cont::DataSet& input,
-    const vtkm::cont::Field& field,
-    const vtkm::filter::PolicyBase<DerivedPolicy>& policy);
+  VTKM_CONT vtkm::cont::DataSet PrepareForExecution(const vtkm::cont::DataSet& input,
+                                                    const vtkm::cont::Field& field,
+                                                    vtkm::filter::PolicyBase<DerivedPolicy> policy);
 
   template <typename DerivedPolicy>
-  VTKM_CONT vtkm::cont::DataSet PrepareForExecution(
-    const vtkm::cont::DataSet& input,
-    const vtkm::cont::CoordinateSystem& field,
-    const vtkm::filter::PolicyBase<DerivedPolicy>& policy);
+  VTKM_CONT vtkm::cont::DataSet PrepareForExecution(const vtkm::cont::DataSet& input,
+                                                    const vtkm::cont::CoordinateSystem& field,
+                                                    vtkm::filter::PolicyBase<DerivedPolicy> policy);
   //@}
 
 protected:
diff --git a/vtkm/filter/FilterField.hxx b/vtkm/filter/FilterField.hxx
index 77add9570..7b546c4a3 100644
--- a/vtkm/filter/FilterField.hxx
+++ b/vtkm/filter/FilterField.hxx
@@ -48,7 +48,7 @@ template <typename Derived>
 template <typename DerivedPolicy>
 inline VTKM_CONT vtkm::cont::DataSet FilterField<Derived>::PrepareForExecution(
   const vtkm::cont::DataSet& input,
-  const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
+  vtkm::filter::PolicyBase<DerivedPolicy> policy)
 {
   if (this->UseCoordinateSystemAsField)
   {
@@ -70,7 +70,7 @@ template <typename DerivedPolicy>
 inline VTKM_CONT vtkm::cont::DataSet FilterField<Derived>::PrepareForExecution(
   const vtkm::cont::DataSet& input,
   const vtkm::cont::Field& field,
-  const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
+  vtkm::filter::PolicyBase<DerivedPolicy> policy)
 {
   vtkm::filter::FieldMetadata metaData(field);
   vtkm::cont::DataSet result;
@@ -92,7 +92,7 @@ template <typename DerivedPolicy>
 inline VTKM_CONT vtkm::cont::DataSet FilterField<Derived>::PrepareForExecution(
   const vtkm::cont::DataSet& input,
   const vtkm::cont::CoordinateSystem& field,
-  const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
+  vtkm::filter::PolicyBase<DerivedPolicy> policy)
 {
   //We have a special signature just for CoordinateSystem, so that we can ask
   //the policy for the storage types and value types just for coordinate systems