diff --git a/include/mapnik/feature.hpp b/include/mapnik/feature.hpp
index 769ca05795..10984733dd 100644
--- a/include/mapnik/feature.hpp
+++ b/include/mapnik/feature.hpp
@@ -110,12 +110,13 @@ class MAPNIK_DECL feature_impl : private util::noncopyable
 
     inline mapnik::value_integer id() const { return id_;}
     inline void set_id(mapnik::value_integer id) { id_ = id;}
+/*
     template <typename T>
     inline void put(context_type::key_type const& key, T const& val)
     {
         put(key, value(val));
     }
-
+*/
     template <typename T>
     inline void put_new(context_type::key_type const& key, T const& val)
     {
diff --git a/include/mapnik/renderer_common/process_group_symbolizer.hpp b/include/mapnik/renderer_common/process_group_symbolizer.hpp
index edec308305..e576661f17 100644
--- a/include/mapnik/renderer_common/process_group_symbolizer.hpp
+++ b/include/mapnik/renderer_common/process_group_symbolizer.hpp
@@ -305,14 +305,14 @@ void render_group_symbolizer(group_symbolizer const& sym,
                     {
                         std::string col_idx_name = col_name;
                         boost::replace_all(col_idx_name, "%", col_idx_str);
-                        sub_feature->put(col_name, feature.get(col_idx_name));
+                        sub_feature->put(col_name, mapnik::value(feature.get(col_idx_name)));
                     }
                 }
             }
             else
             {
                 // non-indexed column
-                sub_feature->put(col_name, feature.get(col_name));
+                sub_feature->put(col_name, mapnik::value(feature.get(col_name)));
             }
         }
 
diff --git a/plugins/input/ogr/ogr_featureset.cpp b/plugins/input/ogr/ogr_featureset.cpp
index 267ebc017d..847547512f 100644
--- a/plugins/input/ogr/ogr_featureset.cpp
+++ b/plugins/input/ogr/ogr_featureset.cpp
@@ -126,13 +126,13 @@ feature_ptr ogr_featureset::next()
             {
             case OFTInteger:
             {
-                feature->put<mapnik::value_integer>( fld_name, poFeature->GetFieldAsInteger(i));
+                feature->put( fld_name, poFeature->GetFieldAsInteger(i));
                 break;
             }
 #if GDAL_VERSION_MAJOR >= 2
             case OFTInteger64:
             {
-                feature->put<mapnik::value_integer>( fld_name, poFeature->GetFieldAsInteger64(i));
+                feature->put( fld_name, poFeature->GetFieldAsInteger64(i));
                 break;
             }
 #endif
diff --git a/plugins/input/ogr/ogr_index_featureset.cpp b/plugins/input/ogr/ogr_index_featureset.cpp
index 348c618f87..a0ab7a92ec 100644
--- a/plugins/input/ogr/ogr_index_featureset.cpp
+++ b/plugins/input/ogr/ogr_index_featureset.cpp
@@ -149,13 +149,13 @@ feature_ptr ogr_index_featureset<filterT>::next()
             {
             case OFTInteger:
             {
-                feature->put<mapnik::value_integer>(fld_name,poFeature->GetFieldAsInteger (i));
+                feature->put(fld_name,poFeature->GetFieldAsInteger (i));
                 break;
             }
 #if GDAL_VERSION_MAJOR >= 2
             case OFTInteger64:
             {
-                feature->put<mapnik::value_integer>( fld_name, poFeature->GetFieldAsInteger64(i));
+                feature->put( fld_name, poFeature->GetFieldAsInteger64(i));
                 break;
             }
 #endif
diff --git a/plugins/input/pgraster/pgraster_featureset.cpp b/plugins/input/pgraster/pgraster_featureset.cpp
index e2d4ccb503..5f12ed9f23 100644
--- a/plugins/input/pgraster/pgraster_featureset.cpp
+++ b/plugins/input/pgraster/pgraster_featureset.cpp
@@ -107,7 +107,7 @@ feature_ptr pgraster_featureset::next()
             // TODO - extend feature class to know
             // that its id is also an attribute to avoid
             // this duplication
-            feature->put<mapnik::value_integer>(name,val);
+            feature->put(name,val);
             ++pos;
         }
         else
@@ -161,19 +161,19 @@ feature_ptr pgraster_featureset::next()
 
                     case 23: //int4
                     {
-                        feature->put<mapnik::value_integer>(name, int4net(buf));
+                        feature->put(name, int4net(buf));
                         break;
                     }
 
                     case 21: //int2
                     {
-                        feature->put<mapnik::value_integer>(name, int2net(buf));
+                        feature->put(name, int2net(buf));
                         break;
                     }
 
                     case 20: //int8/BigInt
                     {
-                        feature->put<mapnik::value_integer>(name, int8net(buf));
+                        feature->put(name, int8net(buf));
                         break;
                     }
 
diff --git a/plugins/input/postgis/postgis_featureset.cpp b/plugins/input/postgis/postgis_featureset.cpp
index 6d417bef1f..f39b735399 100644
--- a/plugins/input/postgis/postgis_featureset.cpp
+++ b/plugins/input/postgis/postgis_featureset.cpp
@@ -101,7 +101,7 @@ feature_ptr postgis_featureset::next()
             feature = feature_factory::create(ctx_, val);
             if (key_field_as_attribute_)
             {
-                feature->put<mapnik::value_integer>(name,val);
+                feature->put(name,val);
             }
             ++pos;
         }
@@ -152,19 +152,19 @@ feature_ptr postgis_featureset::next()
 
                     case 23: //int4
                     {
-                        feature->put<mapnik::value_integer>(name, int4net(buf));
+                        feature->put(name, int4net(buf));
                         break;
                     }
 
                     case 21: //int2
                     {
-                        feature->put<mapnik::value_integer>(name, int2net(buf));
+                        feature->put(name, int2net(buf));
                         break;
                     }
 
                     case 20: //int8/BigInt
                     {
-                        feature->put<mapnik::value_integer>(name, int8net(buf));
+                        feature->put(name, int8net(buf));
                         break;
                     }
 
@@ -188,14 +188,14 @@ feature_ptr postgis_featureset::next()
                     case 1043: //varchar
                     case 705:  //literal
                     {
-                        feature->put(name, tr_->transcode(buf));
+                        feature->put(name, std::move(tr_->transcode(buf)));
                         break;
                     }
 
                     case 1042: //bpchar
                     {
                         std::string str = mapnik::util::trim_copy(buf);
-                        feature->put(name, tr_->transcode(str.c_str()));
+                        feature->put(name, std::move(tr_->transcode(str.c_str())));
                         break;
                     }
 
diff --git a/plugins/input/sqlite/sqlite_featureset.cpp b/plugins/input/sqlite/sqlite_featureset.cpp
index 99a44db546..600b3b142d 100644
--- a/plugins/input/sqlite/sqlite_featureset.cpp
+++ b/plugins/input/sqlite/sqlite_featureset.cpp
@@ -116,7 +116,7 @@ feature_ptr sqlite_featureset::next()
             {
             case SQLITE_INTEGER:
             {
-                feature->put<mapnik::value_integer>(fld_name_str, rs_->column_integer64(i));
+                feature->put(fld_name_str, rs_->column_integer64(i));
                 break;
             }