diff --git a/vtkm/cont/DataSetBuilderRectilinear.h b/vtkm/cont/DataSetBuilderRectilinear.h
index 8e662c802..8348e5eee 100644
--- a/vtkm/cont/DataSetBuilderRectilinear.h
+++ b/vtkm/cont/DataSetBuilderRectilinear.h
@@ -20,174 +20,204 @@
 #ifndef vtk_m_cont_DataSetBuilderRectilinear_h
 #define vtk_m_cont_DataSetBuilderRectilinear_h
 
-#include <vtkm/cont/DataSet.h>
-#include <vtkm/cont/CoordinateSystem.h>
-#include <vtkm/cont/Assert.h>
 #include <vtkm/cont/ArrayHandleCartesianProduct.h>
+#include <vtkm/cont/ArrayPortalToIterators.h>
+#include <vtkm/cont/Assert.h>
+#include <vtkm/cont/CoordinateSystem.h>
+#include <vtkm/cont/DataSet.h>
 
 namespace vtkm {
 namespace cont {
 
-typedef vtkm::cont::DeviceAdapterAlgorithm<VTKM_DEFAULT_DEVICE_ADAPTER_TAG> DFA;
-
 class DataSetBuilderRectilinear
 {
+  template<typename T, typename U>
+  void CopyInto(const std::vector<T>& input,
+                vtkm::cont::ArrayHandle<U>& output )
+  {
+    output.Allocate( static_cast<vtkm::Id>(input.size()) );
+    std::copy( input.begin(), input.end(),
+               ArrayPortalToIteratorBegin(output.GetPortalControl()) );
+  }
+
+  template<typename T, typename U>
+  void CopyInto(const vtkm::cont::ArrayHandle<T>& input,
+                vtkm::cont::ArrayHandle<U>& output )
+  {
+    output.Allocate( input.GetNumberOfValues() );
+    std::copy( ArrayPortalToIteratorBegin(input.GetPortalConstControl()),
+               ArrayPortalToIteratorEnd(input.GetPortalConstControl()),
+               ArrayPortalToIteratorBegin(output.GetPortalControl()) );
+  }
+
+  template<typename T, typename U>
+  void CopyInto(const T* input, vtkm::Id len,
+                vtkm::cont::ArrayHandle<U>& output )
+  {
+    output.Allocate( len );
+    std::copy( input, input+len,
+               output.GetPortalControl().GetIteratorBegin() );
+  }
 public:
-    VTKM_CONT_EXPORT
-    DataSetBuilderRectilinear() {}
+  VTKM_CONT_EXPORT
+  DataSetBuilderRectilinear() {}
 
-    //2D grids.
-    template<typename T>
-    VTKM_CONT_EXPORT
-    vtkm::cont::DataSet
-    Create(vtkm::Id nx, vtkm::Id ny,
-	   T *xvals, T *yvals,
-           std::string coordNm="coords", std::string cellNm="cells")
-    {
-	T zvals = 0;
-	return Create(2, nx,ny, 1, xvals, yvals, &zvals, coordNm, cellNm);
-    }
-    
-    template<typename T>
-    VTKM_CONT_EXPORT
-    vtkm::cont::DataSet
-    Create(int dim, vtkm::Id nx, vtkm::Id ny, vtkm::Id nz,
-           T *xvals, T *yvals, T *zvals,
-           std::string coordNm, std::string cellNm)
-    {
-        VTKM_ASSERT_CONT(nx>1 && ny>1 &&
-			 ((dim==2 && nz==1)||(dim==3 && nz>=1)));
-	
-	vtkm::cont::ArrayHandle<vtkm::FloatDefault> Xc, Yc, Zc;
-	DFA::Copy(vtkm::cont::make_ArrayHandle(xvals,nx), Xc);
-	DFA::Copy(vtkm::cont::make_ArrayHandle(yvals,ny), Yc);
-	DFA::Copy(vtkm::cont::make_ArrayHandle(zvals,nz), Zc);
-	
-	return BuildDataSet(dim, Xc,Yc,Zc, coordNm, cellNm);
-    }
+  //2D grids.
+  template<typename T>
+  VTKM_CONT_EXPORT
+  vtkm::cont::DataSet
+  Create(vtkm::Id nx, vtkm::Id ny,
+         T *xvals, T *yvals,
+         std::string coordNm="coords", std::string cellNm="cells")
+  {
+    T zvals = 0;
+    return Create(2, nx,ny, 1, xvals, yvals, &zvals, coordNm, cellNm);
+  }
 
-    template<typename T>
-    VTKM_CONT_EXPORT
-    vtkm::cont::DataSet
-    Create(const std::vector<T> &xvals, const std::vector<T> &yvals,
-           std::string coordNm="coords", std::string cellNm="cells")
-    {
-	std::vector<T> zvals(1,0);
-	return BuildDataSet(2, xvals,yvals,zvals, coordNm,cellNm);
-    }
-    template<typename T>
-    VTKM_CONT_EXPORT
-    vtkm::cont::DataSet
-    Create(const vtkm::cont::ArrayHandle<T> &xvals,
-	   const vtkm::cont::ArrayHandle<T> &yvals,
-           std::string coordNm="coords", std::string cellNm="cells")
-    {
-        VTKM_ASSERT_CONT(xvals.GetNumberOfValues()>1 && yvals.GetNumberOfValues()>1);
+  template<typename T>
+  VTKM_CONT_EXPORT
+  vtkm::cont::DataSet
+  Create(int dim, vtkm::Id nx, vtkm::Id ny, vtkm::Id nz,
+         T *xvals, T *yvals, T *zvals,
+         std::string coordNm, std::string cellNm)
+  {
+    VTKM_ASSERT_CONT(nx>1 && ny>1 &&
+   ((dim==2 && nz==1)||(dim==3 && nz>=1)));
 
-	vtkm::cont::ArrayHandle<T> zvals;
-	DFA::Copy(vtkm::cont::make_ArrayHandle(std::vector<T>(1,0)), zvals);
-	return BuildDataSet(2, xvals,yvals,zvals, coordNm, cellNm);
-    }
+    vtkm::cont::ArrayHandle<vtkm::FloatDefault> Xc, Yc, Zc;
+    CopyInto(xvals,nx,Xc);
+    CopyInto(yvals,ny,Yc);
+    CopyInto(zvals,nz,Zc);
 
-    //3D grids.
-    template<typename T>
-    VTKM_CONT_EXPORT
-    vtkm::cont::DataSet
-    Create(vtkm::Id nx, vtkm::Id ny, vtkm::Id nz,
-	   T *xvals, T *yvals, T *zvals,
-           std::string coordNm="coords", std::string cellNm="cells")
-    {
-	return Create(3, nx,ny,nz, xvals, yvals, zvals, coordNm, cellNm);
-    }
-    template<typename T>
-    VTKM_CONT_EXPORT
-    vtkm::cont::DataSet
-    Create(const std::vector<T> &xvals,
-	   const std::vector<T> &yvals, 
-	   const std::vector<T> &zvals,
-           std::string coordNm="coords", std::string cellNm="cells")
-    {
-	return BuildDataSet(3, xvals, yvals, zvals, coordNm, cellNm);
-    }
-    template<typename T>
-    VTKM_CONT_EXPORT
-    vtkm::cont::DataSet
-    Create(const vtkm::cont::ArrayHandle<T> &xvals,
-	   const vtkm::cont::ArrayHandle<T> &yvals,
-	   const vtkm::cont::ArrayHandle<T> &zvals,
-           std::string coordNm="coords", std::string cellNm="cells")
-    {
-        VTKM_ASSERT_CONT(xvals.GetNumberOfValues()>1 &&
-			 yvals.GetNumberOfValues()>1 &&
-			 zvals.GetNumberOfValues()>1);
-	return BuildDataSet(3, xvals,yvals,zvals, coordNm, cellNm);
-    }
+    return BuildDataSet(dim, Xc,Yc,Zc, coordNm, cellNm);
+  }
+
+  template<typename T>
+  VTKM_CONT_EXPORT
+  vtkm::cont::DataSet
+  Create(const std::vector<T> &xvals, const std::vector<T> &yvals,
+         std::string coordNm="coords", std::string cellNm="cells")
+  {
+    std::vector<T> zvals(1,0);
+    return BuildDataSet(2, xvals,yvals,zvals, coordNm,cellNm);
+  }
+
+  template<typename T>
+  VTKM_CONT_EXPORT
+  vtkm::cont::DataSet
+  Create(const vtkm::cont::ArrayHandle<T> &xvals,
+         const vtkm::cont::ArrayHandle<T> &yvals,
+         std::string coordNm="coords", std::string cellNm="cells")
+  {
+    VTKM_ASSERT_CONT(xvals.GetNumberOfValues()>1 && yvals.GetNumberOfValues()>1);
+
+    vtkm::cont::ArrayHandle<T> zvals;
+    zvals.Allocate(1);
+    zvals.GetPortalControl().Set(0,0.0);
+    return BuildDataSet(2, xvals,yvals,zvals, coordNm, cellNm);
+  }
+
+  //3D grids.
+  template<typename T>
+  VTKM_CONT_EXPORT
+  vtkm::cont::DataSet
+  Create(vtkm::Id nx, vtkm::Id ny, vtkm::Id nz,
+         T *xvals, T *yvals, T *zvals,
+         std::string coordNm="coords", std::string cellNm="cells")
+  {
+    return Create(3, nx,ny,nz, xvals, yvals, zvals, coordNm, cellNm);
+  }
+
+  template<typename T>
+  VTKM_CONT_EXPORT
+  vtkm::cont::DataSet
+  Create(const std::vector<T> &xvals,
+         const std::vector<T> &yvals,
+         const std::vector<T> &zvals,
+         std::string coordNm="coords", std::string cellNm="cells")
+  {
+    return BuildDataSet(3, xvals, yvals, zvals, coordNm, cellNm);
+  }
+
+  template<typename T>
+  VTKM_CONT_EXPORT
+  vtkm::cont::DataSet
+  Create(const vtkm::cont::ArrayHandle<T> &xvals,
+         const vtkm::cont::ArrayHandle<T> &yvals,
+         const vtkm::cont::ArrayHandle<T> &zvals,
+         std::string coordNm="coords", std::string cellNm="cells")
+  {
+    VTKM_ASSERT_CONT(xvals.GetNumberOfValues()>1 &&
+    yvals.GetNumberOfValues()>1 &&
+    zvals.GetNumberOfValues()>1);
+    return BuildDataSet(3, xvals,yvals,zvals, coordNm, cellNm);
+  }
 
 private:
-    template<typename T>
-    VTKM_CONT_EXPORT
-    vtkm::cont::DataSet
-    BuildDataSet(int dim,
-		 const std::vector<T> &xvals,
-		 const std::vector<T> &yvals,
-		 const std::vector<T> &zvals,
-		 std::string coordNm, std::string cellNm)
-    {
-        VTKM_ASSERT_CONT(xvals.size()>1 && yvals.size()>1 &&
-			 ((dim==2 && zvals.size()==1)||(dim==3 && zvals.size()>=1)));
+  template<typename T>
+  VTKM_CONT_EXPORT
+  vtkm::cont::DataSet
+  BuildDataSet(int dim,
+               const std::vector<T> &xvals,
+               const std::vector<T> &yvals,
+               const std::vector<T> &zvals,
+               std::string coordNm, std::string cellNm)
+  {
+    VTKM_ASSERT_CONT(xvals.size()>1 && yvals.size()>1 &&
+   ((dim==2 && zvals.size()==1)||(dim==3 && zvals.size()>=1)));
 
-	vtkm::cont::ArrayHandle<vtkm::FloatDefault> Xc, Yc, Zc;
-	DFA::Copy(vtkm::cont::make_ArrayHandle(xvals), Xc);
-	DFA::Copy(vtkm::cont::make_ArrayHandle(yvals), Yc);
-	DFA::Copy(vtkm::cont::make_ArrayHandle(zvals), Zc);
-	
-	return BuildDataSet(dim, Xc,Yc,Zc, coordNm, cellNm);
+    vtkm::cont::ArrayHandle<vtkm::FloatDefault> Xc, Yc, Zc;
+    this->CopyInto(xvals, Xc);
+    this->CopyInto(yvals, Yc);
+    this->CopyInto(zvals, Zc);
+
+    return BuildDataSet(dim, Xc,Yc,Zc, coordNm, cellNm);
+  }
+
+  template<typename T>
+  VTKM_CONT_EXPORT
+  vtkm::cont::DataSet
+  BuildDataSet(int dim,
+               const vtkm::cont::ArrayHandle<T> &X,
+               const vtkm::cont::ArrayHandle<T> &Y,
+               const vtkm::cont::ArrayHandle<T> &Z,
+               std::string coordNm, std::string cellNm)
+  {
+    vtkm::cont::DataSet dataSet;
+
+    //Convert all coordinates to floatDefault.
+    vtkm::cont::ArrayHandleCartesianProduct<
+        vtkm::cont::ArrayHandle<vtkm::FloatDefault>,
+        vtkm::cont::ArrayHandle<vtkm::FloatDefault>,
+        vtkm::cont::ArrayHandle<vtkm::FloatDefault> > coords;
+
+    vtkm::cont::ArrayHandle<vtkm::FloatDefault> Xc, Yc, Zc;
+    this->CopyInto(X, Xc);
+    this->CopyInto(Y, Yc);
+    this->CopyInto(Z, Zc);
+
+    coords = vtkm::cont::make_ArrayHandleCartesianProduct(Xc,Yc,Zc);
+    vtkm::cont::CoordinateSystem cs(coordNm, 1, coords);
+    dataSet.AddCoordinateSystem(cs);
+
+    if (dim == 2)
+    {
+      vtkm::cont::CellSetStructured<2> cellSet(cellNm);
+      cellSet.SetPointDimensions(vtkm::make_Vec(Xc.GetNumberOfValues(),
+                                                Yc.GetNumberOfValues()));
+      dataSet.AddCellSet(cellSet);
+    }
+    else
+    {
+      vtkm::cont::CellSetStructured<3> cellSet(cellNm);
+      cellSet.SetPointDimensions(vtkm::make_Vec(Xc.GetNumberOfValues(),
+                                                Yc.GetNumberOfValues(),
+                                                Zc.GetNumberOfValues()));
+      dataSet.AddCellSet(cellSet);
     }
 
-    template<typename T>
-    VTKM_CONT_EXPORT
-    vtkm::cont::DataSet
-    BuildDataSet(int dim,
-		 const vtkm::cont::ArrayHandle<T> &X,
-		 const vtkm::cont::ArrayHandle<T> &Y,
-		 const vtkm::cont::ArrayHandle<T> &Z,
-		 std::string coordNm, std::string cellNm)
-    {
-        vtkm::cont::DataSet dataSet;
-
-	//Convert all coordinates to floatDefault.
-	vtkm::cont::ArrayHandleCartesianProduct<
-	    vtkm::cont::ArrayHandle<vtkm::FloatDefault>,
-	    vtkm::cont::ArrayHandle<vtkm::FloatDefault>,
-	    vtkm::cont::ArrayHandle<vtkm::FloatDefault> > coords;
-
-	vtkm::cont::ArrayHandle<vtkm::FloatDefault> Xc, Yc, Zc;
-	DFA::Copy(X, Xc);
-	DFA::Copy(Y, Yc);
-	DFA::Copy(Z, Zc);
-
-	coords = vtkm::cont::make_ArrayHandleCartesianProduct(Xc,Yc,Zc);
-        vtkm::cont::CoordinateSystem cs(coordNm, 1, coords);
-        dataSet.AddCoordinateSystem(cs);
-    
-        if (dim == 2)
-        {
-            vtkm::cont::CellSetStructured<2> cellSet(cellNm);
-            cellSet.SetPointDimensions(vtkm::make_Vec(Xc.GetNumberOfValues(),
-						      Yc.GetNumberOfValues()));
-            dataSet.AddCellSet(cellSet);
-        }
-        else
-        {
-            vtkm::cont::CellSetStructured<3> cellSet(cellNm);
-            cellSet.SetPointDimensions(vtkm::make_Vec(Xc.GetNumberOfValues(),
-						      Yc.GetNumberOfValues(),
-						      Zc.GetNumberOfValues()));
-            dataSet.AddCellSet(cellSet);
-        }
-
-        return dataSet;
-    }
+    return dataSet;
+  }
 };
 
 } // namespace cont