diff --git a/Classification/include/CGAL/Classification/Point_set_neighborhood.h b/Classification/include/CGAL/Classification/Point_set_neighborhood.h
index e409641bf35..5a051426088 100644
--- a/Classification/include/CGAL/Classification/Point_set_neighborhood.h
+++ b/Classification/include/CGAL/Classification/Point_set_neighborhood.h
@@ -317,9 +317,8 @@ private:
       Point ref (std::floor(p.x() / voxel_size),
                  std::floor(p.y() / voxel_size),
                  std::floor(p.z() / voxel_size));
-      typename std::map<Point, std::vector<std::uint32_t> >::iterator it;
-      std::tie (it, boost::tuples::ignore)
-        = grid.insert (std::make_pair (ref, std::vector<std::uint32_t>()));
+      typename std::map<Point, std::vector<std::uint32_t> >::iterator it
+        = grid.insert (std::make_pair (ref, std::vector<std::uint32_t>())).first;
       it->second.push_back (i);
     }
 
diff --git a/Lab/demo/Lab/include/Point_set_3.h b/Lab/demo/Lab/include/Point_set_3.h
index 5328cc65e8d..a0444c9b744 100644
--- a/Lab/demo/Lab/include/Point_set_3.h
+++ b/Lab/demo/Lab/include/Point_set_3.h
@@ -409,21 +409,15 @@ public:
       {
         if (other.template has_property_map<unsigned char>("red"))
           {
-            std::tie (m_red, boost::tuples::ignore)
-              = this->template add_property_map<unsigned char>("red", 0);
-            std::tie (m_green, boost::tuples::ignore)
-              = this->template add_property_map<unsigned char>("green", 0);
-            std::tie (m_blue, boost::tuples::ignore)
-              = this->template add_property_map<unsigned char>("blue", 0);
+            m_red = this->template add_property_map<unsigned char>("red", 0).first;
+            m_green = this->template add_property_map<unsigned char>("green", 0).first;
+            m_blue = this->template add_property_map<unsigned char>("blue", 0).first;
           }
         else
           {
-            std::tie (m_red, boost::tuples::ignore)
-              = this->template add_property_map<unsigned char>("r", 0);
-            std::tie (m_green, boost::tuples::ignore)
-              = this->template add_property_map<unsigned char>("g", 0);
-            std::tie (m_blue, boost::tuples::ignore)
-              = this->template add_property_map<unsigned char>("b", 0);
+            m_red = this->template add_property_map<unsigned char>("r", 0).first;
+            m_green = this->template add_property_map<unsigned char>("g", 0).first;
+            m_blue = this->template add_property_map<unsigned char>("b", 0).first;
           }
       }
 
diff --git a/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h b/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h
index 0a46e477a49..5cad538b3ea 100644
--- a/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h
+++ b/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h
@@ -57,7 +57,7 @@ private:
     PLY_property_to_point_set_property(Point_set& ps, const std::string& name)
       : m_name(name)
     {
-      std::tie(m_map, boost::tuples::ignore) = ps.add_property_map(name, Type());
+      m_map = ps.add_property_map(name, Type()).first;
       m_pmap = ps.push_property_map(m_map);
     }