diff --git a/vtkm/cont/ArrayHandle.h b/vtkm/cont/ArrayHandle.h
index 46e0972ee..e1954c0c6 100644
--- a/vtkm/cont/ArrayHandle.h
+++ b/vtkm/cont/ArrayHandle.h
@@ -1109,7 +1109,7 @@ public:
     return true; // different valuetype and/or storage
   }
 
-  VTKM_CONT vtkm::IdComponent GetNumberOfBuffers() const
+  VTKM_CONT constexpr vtkm::IdComponent GetNumberOfBuffers() const
   {
     return StorageType::GetNumberOfBuffers();
   }
diff --git a/vtkm/cont/ArrayHandleBasic.h b/vtkm/cont/ArrayHandleBasic.h
index 419162024..620f319e2 100644
--- a/vtkm/cont/ArrayHandleBasic.h
+++ b/vtkm/cont/ArrayHandleBasic.h
@@ -34,7 +34,7 @@ public:
   using ReadPortalType = vtkm::internal::ArrayPortalBasicRead<T>;
   using WritePortalType = vtkm::internal::ArrayPortalBasicWrite<T>;
 
-  VTKM_CONT static vtkm::IdComponent GetNumberOfBuffers() { return 1; }
+  VTKM_CONT constexpr static vtkm::IdComponent GetNumberOfBuffers() { return 1; }
 
   VTKM_CONT static void ResizeBuffers(vtkm::Id numValues,
                                       vtkm::cont::internal::Buffer* buffers,
diff --git a/vtkm/cont/ArrayHandleBitField.h b/vtkm/cont/ArrayHandleBitField.h
index 41b2e5482..4a0b47541 100644
--- a/vtkm/cont/ArrayHandleBitField.h
+++ b/vtkm/cont/ArrayHandleBitField.h
@@ -82,7 +82,7 @@ public:
   using ReadPortalType = vtkm::cont::internal::ArrayPortalBitField<BitPortalConstType>;
   using WritePortalType = vtkm::cont::internal::ArrayPortalBitField<BitPortalType>;
 
-  VTKM_CONT static vtkm::IdComponent GetNumberOfBuffers() { return 1; }
+  VTKM_CONT constexpr static vtkm::IdComponent GetNumberOfBuffers() { return 1; }
 
   VTKM_CONT static void ResizeBuffers(vtkm::Id numberOfBits,
                                       vtkm::cont::internal::Buffer* buffers,
diff --git a/vtkm/cont/ArrayHandleCartesianProduct.h b/vtkm/cont/ArrayHandleCartesianProduct.h
index 71c1b7112..ee1a6ef29 100644
--- a/vtkm/cont/ArrayHandleCartesianProduct.h
+++ b/vtkm/cont/ArrayHandleCartesianProduct.h
@@ -203,19 +203,19 @@ class Storage<vtkm::Vec<T, 3>, vtkm::cont::StorageTagCartesianProduct<ST1, ST2,
   using Storage3 = vtkm::cont::internal::Storage<T, ST3>;
 
   template <typename Buffs>
-  VTKM_CONT static Buffs* Buffers1(Buffs* buffers)
+  VTKM_CONT constexpr static Buffs* Buffers1(Buffs* buffers)
   {
     return buffers;
   }
 
   template <typename Buffs>
-  VTKM_CONT static Buffs* Buffers2(Buffs* buffers)
+  VTKM_CONT constexpr static Buffs* Buffers2(Buffs* buffers)
   {
     return buffers + Storage1::GetNumberOfBuffers();
   }
 
   template <typename Buffs>
-  VTKM_CONT static Buffs* Buffers3(Buffs* buffers)
+  VTKM_CONT constexpr static Buffs* Buffers3(Buffs* buffers)
   {
     return buffers + Storage1::GetNumberOfBuffers() + Storage2::GetNumberOfBuffers();
   }
@@ -232,7 +232,7 @@ public:
                                                 typename Storage2::WritePortalType,
                                                 typename Storage3::WritePortalType>;
 
-  VTKM_CONT static vtkm::IdComponent GetNumberOfBuffers()
+  VTKM_CONT constexpr static vtkm::IdComponent GetNumberOfBuffers()
   {
     return Storage1::GetNumberOfBuffers() + Storage2::GetNumberOfBuffers() +
       Storage3::GetNumberOfBuffers();
diff --git a/vtkm/cont/ArrayHandleDiscard.h b/vtkm/cont/ArrayHandleDiscard.h
index d1e6cda23..0c331e655 100644
--- a/vtkm/cont/ArrayHandleDiscard.h
+++ b/vtkm/cont/ArrayHandleDiscard.h
@@ -103,7 +103,7 @@ public:
   // you actually try to use this read portal.
   using ReadPortalType = vtkm::exec::internal::ArrayPortalDiscard<ValueType>;
 
-  VTKM_CONT static vtkm::IdComponent GetNumberOfBuffers() { return 1; }
+  VTKM_CONT constexpr static vtkm::IdComponent GetNumberOfBuffers() { return 1; }
 
   VTKM_CONT static void ResizeBuffers(vtkm::Id numValues,
                                       vtkm::cont::internal::Buffer* buffers,
diff --git a/vtkm/cont/ArrayHandleImplicit.h b/vtkm/cont/ArrayHandleImplicit.h
index f71594e56..87fda7b80 100644
--- a/vtkm/cont/ArrayHandleImplicit.h
+++ b/vtkm/cont/ArrayHandleImplicit.h
@@ -105,7 +105,7 @@ struct VTKM_ALWAYS_EXPORT
 
   // Implicit array has one buffer that should be empty (NumberOfBytes = 0), but holds
   // the metadata for the array.
-  VTKM_CONT static vtkm::IdComponent GetNumberOfBuffers() { return 1; }
+  VTKM_CONT constexpr static vtkm::IdComponent GetNumberOfBuffers() { return 1; }
 
   VTKM_CONT static vtkm::Id GetNumberOfValues(const vtkm::cont::internal::Buffer* buffers)
   {
diff --git a/vtkm/cont/ArrayHandleReverse.h b/vtkm/cont/ArrayHandleReverse.h
index 69bfe91f8..f7f02d0e4 100644
--- a/vtkm/cont/ArrayHandleReverse.h
+++ b/vtkm/cont/ArrayHandleReverse.h
@@ -127,7 +127,7 @@ public:
   using ReadPortalType = ArrayPortalReverse<typename ArrayHandleType::ReadPortalType>;
   using WritePortalType = ArrayPortalReverse<typename ArrayHandleType::WritePortalType>;
 
-  VTKM_CONT static vtkm::IdComponent GetNumberOfBuffers()
+  VTKM_CONT constexpr static vtkm::IdComponent GetNumberOfBuffers()
   {
     return SourceStorage::GetNumberOfBuffers();
   }
diff --git a/vtkm/cont/ArrayHandleSOA.h b/vtkm/cont/ArrayHandleSOA.h
index fd3228bad..06180d717 100644
--- a/vtkm/cont/ArrayHandleSOA.h
+++ b/vtkm/cont/ArrayHandleSOA.h
@@ -142,7 +142,7 @@ public:
   using WritePortalType =
     vtkm::internal::ArrayPortalSOA<T, vtkm::internal::ArrayPortalBasicWrite<ComponentType>>;
 
-  VTKM_CONT static vtkm::IdComponent GetNumberOfBuffers() { return NUM_COMPONENTS; }
+  VTKM_CONT constexpr static vtkm::IdComponent GetNumberOfBuffers() { return NUM_COMPONENTS; }
 
   VTKM_CONT static void ResizeBuffers(vtkm::Id numValues,
                                       vtkm::cont::internal::Buffer* buffers,