diff --git a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h
index 3927c0179..ec75ed831 100644
--- a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h
+++ b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h
@@ -258,8 +258,8 @@ class DeviceTaskTypes<vtkm::cont::DeviceAdapterTagCuda>
 public:
   template <typename WorkletType, typename InvocationType>
   static vtkm::exec::internal::TaskSingular<WorkletType, InvocationType> MakeTask(
-    const WorkletType& worklet,
-    const InvocationType& invocation,
+    WorkletType& worklet,
+    InvocationType& invocation,
     vtkm::Id,
     vtkm::Id globalIndexOffset = 0)
   {
@@ -269,8 +269,8 @@ public:
 
   template <typename WorkletType, typename InvocationType>
   static vtkm::exec::internal::TaskSingular<WorkletType, InvocationType> MakeTask(
-    const WorkletType& worklet,
-    const InvocationType& invocation,
+    WorkletType& worklet,
+    InvocationType& invocation,
     vtkm::Id3,
     vtkm::Id globalIndexOffset = 0)
   {
diff --git a/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h b/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h
index f17fa9d31..fc4144263 100644
--- a/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h
+++ b/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h
@@ -1020,8 +1020,8 @@ class DeviceTaskTypes
 public:
   template <typename WorkletType, typename InvocationType>
   static vtkm::exec::internal::TaskSingular<WorkletType, InvocationType> MakeTask(
-    const WorkletType& worklet,
-    const InvocationType& invocation,
+    WorkletType& worklet,
+    InvocationType& invocation,
     vtkm::Id,
     vtkm::Id globalIndexOffset = 0)
   {
@@ -1031,8 +1031,8 @@ public:
 
   template <typename WorkletType, typename InvocationType>
   static vtkm::exec::internal::TaskSingular<WorkletType, InvocationType> MakeTask(
-    const WorkletType& worklet,
-    const InvocationType& invocation,
+    WorkletType& worklet,
+    InvocationType& invocation,
     vtkm::Id3,
     vtkm::Id globalIndexOffset = 0)
   {
diff --git a/vtkm/cont/serial/internal/DeviceAdapterAlgorithmSerial.h b/vtkm/cont/serial/internal/DeviceAdapterAlgorithmSerial.h
index 1354d25e0..ec14b19b9 100644
--- a/vtkm/cont/serial/internal/DeviceAdapterAlgorithmSerial.h
+++ b/vtkm/cont/serial/internal/DeviceAdapterAlgorithmSerial.h
@@ -513,8 +513,8 @@ class DeviceTaskTypes<vtkm::cont::DeviceAdapterTagSerial>
 {
 public:
   template <typename WorkletType, typename InvocationType>
-  static vtkm::exec::serial::internal::TaskTiling1D MakeTask(const WorkletType& worklet,
-                                                             const InvocationType& invocation,
+  static vtkm::exec::serial::internal::TaskTiling1D MakeTask(WorkletType& worklet,
+                                                             InvocationType& invocation,
                                                              vtkm::Id,
                                                              vtkm::Id globalIndexOffset = 0)
   {
@@ -522,8 +522,8 @@ public:
   }
 
   template <typename WorkletType, typename InvocationType>
-  static vtkm::exec::serial::internal::TaskTiling3D MakeTask(const WorkletType& worklet,
-                                                             const InvocationType& invocation,
+  static vtkm::exec::serial::internal::TaskTiling3D MakeTask(WorkletType& worklet,
+                                                             InvocationType& invocation,
                                                              vtkm::Id3,
                                                              vtkm::Id globalIndexOffset = 0)
   {
diff --git a/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h b/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h
index 9e22c7853..157d8e055 100644
--- a/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h
+++ b/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h
@@ -366,8 +366,8 @@ class DeviceTaskTypes<vtkm::cont::DeviceAdapterTagTBB>
 {
 public:
   template <typename WorkletType, typename InvocationType>
-  static vtkm::exec::serial::internal::TaskTiling1D MakeTask(const WorkletType& worklet,
-                                                             const InvocationType& invocation,
+  static vtkm::exec::serial::internal::TaskTiling1D MakeTask(WorkletType& worklet,
+                                                             InvocationType& invocation,
                                                              vtkm::Id,
                                                              vtkm::Id globalIndexOffset = 0)
   {
@@ -375,8 +375,8 @@ public:
   }
 
   template <typename WorkletType, typename InvocationType>
-  static vtkm::exec::serial::internal::TaskTiling3D MakeTask(const WorkletType& worklet,
-                                                             const InvocationType& invocation,
+  static vtkm::exec::serial::internal::TaskTiling3D MakeTask(WorkletType& worklet,
+                                                             InvocationType& invocation,
                                                              vtkm::Id3,
                                                              vtkm::Id globalIndexOffset = 0)
   {
diff --git a/vtkm/exec/internal/TaskSingular.h b/vtkm/exec/internal/TaskSingular.h
index 010728275..39cd6e28c 100644
--- a/vtkm/exec/internal/TaskSingular.h
+++ b/vtkm/exec/internal/TaskSingular.h
@@ -75,7 +75,7 @@ public:
   }
 
 private:
-  WorkletType Worklet;
+  typename std::remove_const<WorkletType>::type Worklet;
   // This is held by by value so that when we transfer the invocation object
   // over to CUDA it gets properly copied to the device. While we want to
   // hold by reference to reduce the number of copies, it is not possible
diff --git a/vtkm/exec/serial/internal/TaskTiling.h b/vtkm/exec/serial/internal/TaskTiling.h
index 4d09c6b79..c8ffab6d3 100644
--- a/vtkm/exec/serial/internal/TaskTiling.h
+++ b/vtkm/exec/serial/internal/TaskTiling.h
@@ -173,7 +173,7 @@ public:
   /// parameters that go along with it
   template <typename WorkletType, typename InvocationType>
   TaskTiling1D(WorkletType& worklet,
-               const InvocationType& invocation,
+               InvocationType& invocation,
                const vtkm::Id& globalIndexOffset = 0)
     : Worklet(nullptr)
     , Invocation(nullptr)
@@ -263,7 +263,7 @@ public:
 
   template <typename WorkletType, typename InvocationType>
   TaskTiling3D(WorkletType& worklet,
-               const InvocationType& invocation,
+               InvocationType& invocation,
                const vtkm::Id& globalIndexOffset = 0)
     : Worklet(nullptr)
     , Invocation(nullptr)