diff --git a/include/mapnik/marker_cache.hpp b/include/mapnik/marker_cache.hpp
index 1d835d167..40cf8048f 100644
--- a/include/mapnik/marker_cache.hpp
+++ b/include/mapnik/marker_cache.hpp
@@ -46,7 +46,7 @@ class MAPNIK_DECL marker_cache :
 private:
     marker_cache();
     ~marker_cache();
-    bool insert_marker(std::string const& key, marker & path);
+    bool insert_marker(std::string const& key, marker && path);
     boost::unordered_map<std::string, mapnik::marker> marker_cache_;
     bool insert_svg(std::string const& name, std::string const& svg_string);
     boost::unordered_map<std::string,std::string> svg_cache_;
diff --git a/include/mapnik/renderer_common/process_group_symbolizer.hpp b/include/mapnik/renderer_common/process_group_symbolizer.hpp
index da5900de9..d1dbcf474 100644
--- a/include/mapnik/renderer_common/process_group_symbolizer.hpp
+++ b/include/mapnik/renderer_common/process_group_symbolizer.hpp
@@ -127,16 +127,15 @@ struct vector_marker_render_thunk  : util::noncopyable
         snap_to_pixels_(std::move(rhs.snap_to_pixels_)) {}
 };
 
-template <typename BufferType>
 struct raster_marker_render_thunk  : util::noncopyable
 {
-    BufferType const& src_;
+    image_rgba8 const& src_;
     agg::trans_affine tr_;
     double opacity_;
     composite_mode_e comp_op_;
     bool snap_to_pixels_;
 
-    raster_marker_render_thunk(BufferType const& src,
+    raster_marker_render_thunk(image_rgba8 const& src,
                                agg::trans_affine const& marker_trans,
                                double opacity,
                                composite_mode_e comp_op,
@@ -150,8 +149,6 @@ struct raster_marker_render_thunk  : util::noncopyable
         snap_to_pixels_(std::move(rhs.snap_to_pixels_)) {}
 };
 
-template struct raster_marker_render_thunk<image_rgba8>;
-
 using helper_ptr = std::unique_ptr<text_symbolizer_helper>;
 
 struct text_render_thunk : util::noncopyable
@@ -181,7 +178,7 @@ struct text_render_thunk : util::noncopyable
 // via a static visitor later.
 
 using render_thunk = util::variant<vector_marker_render_thunk,
-                                   raster_marker_render_thunk<image_rgba8>,
+                                   raster_marker_render_thunk,
                                    text_render_thunk>;
 using render_thunk_ptr = std::unique_ptr<render_thunk>;
 using render_thunk_list = std::list<render_thunk_ptr>;
diff --git a/src/agg/process_group_symbolizer.cpp b/src/agg/process_group_symbolizer.cpp
index 5ed8cae1c..df930f2ac 100644
--- a/src/agg/process_group_symbolizer.cpp
+++ b/src/agg/process_group_symbolizer.cpp
@@ -94,7 +94,7 @@ struct thunk_renderer<image_rgba8>
         render_vector_marker(svg_renderer, *ras_ptr_, renb, thunk.src_->bounding_box(), offset_tr, thunk.opacity_, thunk.snap_to_pixels_);
     }
 
-    void operator()(raster_marker_render_thunk<image_rgba8> const &thunk) const
+    void operator()(raster_marker_render_thunk const &thunk) const
     {
         using blender_type = agg::comp_op_adaptor_rgba_pre<agg::rgba8, agg::order_rgba>; // comp blender
         using buf_type = agg::rendering_buffer;
diff --git a/src/cairo/process_group_symbolizer.cpp b/src/cairo/process_group_symbolizer.cpp
index 216114347..1e46a2028 100644
--- a/src/cairo/process_group_symbolizer.cpp
+++ b/src/cairo/process_group_symbolizer.cpp
@@ -77,7 +77,7 @@ struct thunk_renderer
                                      thunk.opacity_);
     }
 
-    void operator()(raster_marker_render_thunk<image_rgba8> const &thunk) const
+    void operator()(raster_marker_render_thunk const& thunk) const
     {
         cairo_save_restore guard(context_);
         context_.set_operator(thunk.comp_op_);
diff --git a/src/grid/process_group_symbolizer.cpp b/src/grid/process_group_symbolizer.cpp
index 154b9b894..1931f9ce4 100644
--- a/src/grid/process_group_symbolizer.cpp
+++ b/src/grid/process_group_symbolizer.cpp
@@ -105,7 +105,7 @@ struct thunk_renderer
         pixmap_.add_feature(feature_);
     }
 
-    void operator()(raster_marker_render_thunk<image_rgba8> const &thunk) const
+    void operator()(raster_marker_render_thunk const &thunk) const
     {
         using buf_type = grid_rendering_buffer;
         using pixfmt_type = typename grid_renderer_base_type::pixfmt_type;
diff --git a/src/marker_cache.cpp b/src/marker_cache.cpp
index 7f4ba5cb9..e4daeb559 100644
--- a/src/marker_cache.cpp
+++ b/src/marker_cache.cpp
@@ -109,7 +109,7 @@ bool marker_cache::insert_svg(std::string const& name, std::string const& svg_st
     return false;
 }
 
-bool marker_cache::insert_marker(std::string const& uri, mapnik::marker & path)
+bool marker_cache::insert_marker(std::string const& uri, mapnik::marker && path)
 {
 #ifdef MAPNIK_THREADSAFE
     mapnik::scoped_lock lock(mutex_);
diff --git a/src/renderer_common/process_group_symbolizer.cpp b/src/renderer_common/process_group_symbolizer.cpp
index eedd1e1a1..3725220fb 100644
--- a/src/renderer_common/process_group_symbolizer.cpp
+++ b/src/renderer_common/process_group_symbolizer.cpp
@@ -39,8 +39,7 @@ vector_marker_render_thunk::vector_marker_render_thunk(svg_path_ptr const& src,
       comp_op_(comp_op), snap_to_pixels_(snap_to_pixels)
 {}
 
-template <>
-raster_marker_render_thunk<image_rgba8>::raster_marker_render_thunk(image_rgba8 const& src,
+raster_marker_render_thunk::raster_marker_render_thunk(image_rgba8 const& src,
                                                        agg::trans_affine const& marker_trans,
                                                        double opacity,
                                                        composite_mode_e comp_op,
@@ -116,7 +115,7 @@ struct raster_marker_thunk_dispatch : public raster_markers_dispatch<Detector>
 
     void render_marker(agg::trans_affine const& marker_tr, double opacity)
     {
-        raster_marker_render_thunk<image_rgba8> thunk(this->src_, marker_tr, opacity, comp_op_, snap_to_pixels_);
+        raster_marker_render_thunk thunk(this->src_, marker_tr, opacity, comp_op_, snap_to_pixels_);
         thunks_.push_back(std::make_unique<render_thunk>(std::move(thunk)));
     }