diff --git a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_ring_C2.h b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_ring_C2.h
index 8eb71dd8cc7..bb12d68be8e 100644
--- a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_ring_C2.h
+++ b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_ring_C2.h
@@ -604,14 +604,15 @@ private:
   {
     CGAL_precondition(bside % 2 == 1);
     const bool side_ver = (bside % 4 == 1);
-    FT pcoord = (side_ver) ? p.point().x() : p.point().y();
-    FT qcoord = coord_at(lq, pcoord, side_ver);
-    FT rcoord = coord_at(lr, pcoord, side_ver);
-    FT sidelen = CGAL::abs(qcoord-rcoord);
+    const FT pcoord = (side_ver) ? p.point().x() : p.point().y();
+    const FT qcoord = coord_at(lq, pcoord, side_ver);
+    const FT rcoord = coord_at(lr, pcoord, side_ver);
+    const FT sidelen = CGAL::abs(qcoord-rcoord);
     const int sgn = (bside < 4) ? -1 : +1;
-    ux_ = side_ver? RT(2)*pcoord + sgn*sidelen : qcoord+rcoord;
-    uy_ = side_ver? qcoord+rcoord : RT(2)*pcoord + sgn*sidelen;
-    uz_ = RT(2);
+    const RT two(2);
+    ux_ = side_ver ? (two*pcoord + sgn*sidelen) : (qcoord+rcoord);
+    uy_ = side_ver ? (qcoord+rcoord) : (two*pcoord + sgn*sidelen);
+    uz_ = two;
   }
 
   inline void
@@ -925,16 +926,16 @@ private:
     const RT & dy = is_r_hor ? distr : distq;
     const Comparison_result cmp = CGAL::compare(dx, dy);
     if (cmp == LARGER) {
-      ux_ = is_q_hor ? r_coord + p_coord_r : q_coord + p_coord_q;
-      uy_ = is_q_hor ? RT(2)*q_coord + CGAL::sign(sdistq)*dx :
-                       RT(2)*r_coord + CGAL::sign(sdistr)*dx ;
+      ux_ = is_q_hor ? (r_coord + p_coord_r) : (q_coord + p_coord_q);
+      uy_ = is_q_hor ? (RT(2)*q_coord + CGAL::sign(sdistq)*dx) :
+                       (RT(2)*r_coord + CGAL::sign(sdistr)*dx) ;
     } else if (cmp == SMALLER) {
-      uy_ = is_r_hor ? r_coord + p_coord_r : q_coord + p_coord_q;
-      ux_ = is_r_hor ? RT(2)*q_coord + CGAL::sign(sdistq)*dy :
-                       RT(2)*r_coord + CGAL::sign(sdistr)*dy ;
+      uy_ = is_r_hor ? (r_coord + p_coord_r) : (q_coord + p_coord_q);
+      ux_ = is_r_hor ? (RT(2)*q_coord + CGAL::sign(sdistq)*dy) :
+                       (RT(2)*r_coord + CGAL::sign(sdistr)*dy) ;
     } else {
-      ux_ = is_q_hor ? r_coord + p_coord_r : q_coord + p_coord_q;
-      uy_ = is_q_hor ? q_coord + p_coord_q : r_coord + p_coord_r;
+      ux_ = is_q_hor ? (r_coord + p_coord_r) : (q_coord + p_coord_q);
+      uy_ = is_q_hor ? (q_coord + p_coord_q) : (r_coord + p_coord_r);
     }
     uz_ = RT(2);
   }
diff --git a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_sqrt_field_new_C2.h b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_sqrt_field_new_C2.h
index 4ecc40e814d..f48017c24ec 100644
--- a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_sqrt_field_new_C2.h
+++ b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_sqrt_field_new_C2.h
@@ -664,7 +664,7 @@ private:
       const RT signrdist = (is_r_horizontal ? pp.y() : pp.x()) - coordr;
       Comparison_result comp = CGAL::compare(pqdist, CGAL::abs(signrdist));
       vv = Point_2(is_r_horizontal ?
-                     pp.x() + qq.x() :
+                     (pp.x() + qq.x()) :
                      (comp == LARGER) ?
                        RT(2)*coordr + CGAL::sign(signrdist)*pqdist :
                        coordr + pp.x(),
@@ -672,7 +672,7 @@ private:
                      (comp == LARGER) ?
                        RT(2)*coordr + CGAL::sign(signrdist)*pqdist :
                        coordr + pp.y() :
-                     pp.y() + qq.y(),
+                     (pp.y() + qq.y()),
                    RT(2));
       return;
     }
@@ -698,19 +698,19 @@ private:
       const bool is_p_farthest = farp == pp;
       const Point_2 & closep = (is_p_farthest)? qq : pp;
       vv = Point_2(is_r_horizontal ?
-                   RT(2) * closep.x() - (is_p_farthest? -1 : +1) * sdistf :
-                   RT(2)*coordr + sdistf,
+                   (RT(2) * closep.x() - (is_p_farthest? -1 : +1) * sdistf) :
+                   (RT(2)*coordr + sdistf),
                    is_r_horizontal ?
-                   RT(2)*coordr + sdistf :
-                   RT(2) * closep.y() + (is_p_farthest? -1 : +1) * sdistf,
+                   (RT(2)*coordr + sdistf) :
+                   (RT(2) * closep.y() + (is_p_farthest? -1 : +1) * sdistf),
                    RT(2));
     } else {
       vv = Point_2(is_r_horizontal ?
-                   pp.x() + qq.x() :
-                   RT(2)*coordr + CGAL::sign(sdistf)*pqdist,
+                   (pp.x() + qq.x()) :
+                   (RT(2)*coordr + CGAL::sign(sdistf)*pqdist),
                    is_r_horizontal ?
-                   RT(2)*coordr + CGAL::sign(sdistf)*pqdist :
-                   pp.y() + qq.y(),
+                   (RT(2)*coordr + CGAL::sign(sdistf)*pqdist) :
+                   (pp.y() + qq.y()),
                    RT(2));
     }
     return;
@@ -1382,12 +1382,12 @@ private:
     RT ux_, uy_, uz_;
     if (cmp == LARGER) {
       ux_ = is_q_hor ? r_coord + p_coord_r : q_coord + p_coord_q;
-      uy_ = is_q_hor ? RT(2)*q_coord + CGAL::sign(sdistq)*dx :
-                       RT(2)*r_coord + CGAL::sign(sdistr)*dx ;
+      uy_ = is_q_hor ? (RT(2)*q_coord + CGAL::sign(sdistq)*dx) :
+                       (RT(2)*r_coord + CGAL::sign(sdistr)*dx) ;
     } else if (cmp == SMALLER) {
       uy_ = is_r_hor ? r_coord + p_coord_r : q_coord + p_coord_q;
-      ux_ = is_r_hor ? RT(2)*q_coord + CGAL::sign(sdistq)*dy :
-                       RT(2)*r_coord + CGAL::sign(sdistr)*dy ;
+      ux_ = is_r_hor ? (RT(2)*q_coord + CGAL::sign(sdistq)*dy) :
+                       (RT(2)*r_coord + CGAL::sign(sdistr)*dy) ;
     } else {
       ux_ = is_q_hor ? r_coord + p_coord_r : q_coord + p_coord_q;
       uy_ = is_q_hor ? q_coord + p_coord_q : r_coord + p_coord_r;