diff --git a/src/GC/GC_MakeArcOfCircle.cdl b/src/GC/GC_MakeArcOfCircle.cdl
index 75364905fc..38afa0e766 100644
--- a/src/GC/GC_MakeArcOfCircle.cdl
+++ b/src/GC/GC_MakeArcOfCircle.cdl
@@ -95,11 +95,7 @@ Value(me) returns TrimmedCurve from Geom
     ---Purpose: Returns the constructed arc of circle.
     -- Exceptions StdFail_NotDone if no arc of circle is constructed.
     ---C++: return const&
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+    ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeArcOfCircle.cxx b/src/GC/GC_MakeArcOfCircle.cxx
index 41d22e2f75..866dbe35b8 100644
--- a/src/GC/GC_MakeArcOfCircle.cxx
+++ b/src/GC/GC_MakeArcOfCircle.cxx
@@ -161,20 +161,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeArcOfCircle::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-//=======================================================================
-//function : Operator
-//purpose  : 
-//=======================================================================
-const Handle(Geom_TrimmedCurve)& GC_MakeArcOfCircle::Operator() const 
-{
-  return Value();
-}
-//=======================================================================
-//function : operator
-//purpose  : 
-//=======================================================================
-GC_MakeArcOfCircle::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-
diff --git a/src/GC/GC_MakeArcOfEllipse.cdl b/src/GC/GC_MakeArcOfEllipse.cdl
index cd1555764a..d9c1fcf9a3 100644
--- a/src/GC/GC_MakeArcOfEllipse.cdl
+++ b/src/GC/GC_MakeArcOfEllipse.cdl
@@ -67,11 +67,7 @@ Value(me) returns TrimmedCurve from Geom
     is static;
     	---C++: return const&
     	---Purpose: Returns the constructed arc of ellipse.
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeArcOfEllipse.cxx b/src/GC/GC_MakeArcOfEllipse.cxx
index fc859d838c..ceb77ff3ab 100644
--- a/src/GC/GC_MakeArcOfEllipse.cxx
+++ b/src/GC/GC_MakeArcOfEllipse.cxx
@@ -57,17 +57,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeArcOfEllipse::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom_TrimmedCurve)& GC_MakeArcOfEllipse::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeArcOfEllipse::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-
-
-
-
diff --git a/src/GC/GC_MakeArcOfHyperbola.cdl b/src/GC/GC_MakeArcOfHyperbola.cdl
index 61497269ee..439c03f41d 100644
--- a/src/GC/GC_MakeArcOfHyperbola.cdl
+++ b/src/GC/GC_MakeArcOfHyperbola.cdl
@@ -64,11 +64,7 @@ Value(me) returns TrimmedCurve from Geom
     is static;
     	--- Purpose: Returns the constructed arc of hyperbola.
     	---C++: return const&
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeArcOfHyperbola.cxx b/src/GC/GC_MakeArcOfHyperbola.cxx
index 26bf6454e2..ffbca7bc57 100644
--- a/src/GC/GC_MakeArcOfHyperbola.cxx
+++ b/src/GC/GC_MakeArcOfHyperbola.cxx
@@ -58,14 +58,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeArcOfHyperbola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom_TrimmedCurve)& GC_MakeArcOfHyperbola::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeArcOfHyperbola::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-
diff --git a/src/GC/GC_MakeArcOfParabola.cdl b/src/GC/GC_MakeArcOfParabola.cdl
index e763aed051..0aafdc03d8 100644
--- a/src/GC/GC_MakeArcOfParabola.cdl
+++ b/src/GC/GC_MakeArcOfParabola.cdl
@@ -60,11 +60,7 @@ Value(me) returns TrimmedCurve from Geom
     is static;
     	---Purpose: Returns the constructed arc of parabola.
     	---C++: return const&
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeArcOfParabola.cxx b/src/GC/GC_MakeArcOfParabola.cxx
index acb1d0059a..b388ba55c7 100644
--- a/src/GC/GC_MakeArcOfParabola.cxx
+++ b/src/GC/GC_MakeArcOfParabola.cxx
@@ -57,14 +57,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeArcOfParabola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom_TrimmedCurve)& GC_MakeArcOfParabola::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeArcOfParabola::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-
diff --git a/src/GC/GC_MakeCircle.cdl b/src/GC/GC_MakeCircle.cdl
index 9df09a7d13..be69272747 100644
--- a/src/GC/GC_MakeCircle.cdl
+++ b/src/GC/GC_MakeCircle.cdl
@@ -100,11 +100,7 @@ Value(me) returns Circle from Geom
     -- Exceptions
     -- StdFail_NotDone if no circle is constructed.
     ---C++: return const&
-
-Operator(me) returns Circle from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Circle() const;"
+    ---C++: alias "operator const Handle(Geom_Circle)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeCircle.cxx b/src/GC/GC_MakeCircle.cxx
index 3caac6715f..387301140b 100644
--- a/src/GC/GC_MakeCircle.cxx
+++ b/src/GC/GC_MakeCircle.cxx
@@ -100,14 +100,3 @@ const Handle(Geom_Circle)& GC_MakeCircle::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCircle;
 }
-
-const Handle(Geom_Circle)& GC_MakeCircle::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeCircle::operator Handle(Geom_Circle) () const
-{
-  return Value();
-}
-
diff --git a/src/GC/GC_MakeConicalSurface.cdl b/src/GC/GC_MakeConicalSurface.cdl
index 9c36ddecfb..2ec60e31c8 100644
--- a/src/GC/GC_MakeConicalSurface.cdl
+++ b/src/GC/GC_MakeConicalSurface.cdl
@@ -128,11 +128,7 @@ Value(me) returns ConicalSurface from Geom
     	-- Exceptions
     	-- StdFail_NotDone if no cone is constructed.
     	---C++: return const&
-
-Operator(me) returns ConicalSurface from Geom
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom_ConicalSurface() const;"
+        ---C++: alias "operator const Handle(Geom_ConicalSurface)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeConicalSurface.cxx b/src/GC/GC_MakeConicalSurface.cxx
index aa8546c4bc..2e8d1b6298 100644
--- a/src/GC/GC_MakeConicalSurface.cxx
+++ b/src/GC/GC_MakeConicalSurface.cxx
@@ -108,14 +108,3 @@ const Handle(Geom_ConicalSurface)& GC_MakeConicalSurface::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCone;
 }
-
-const Handle(Geom_ConicalSurface)& GC_MakeConicalSurface::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeConicalSurface::operator Handle(Geom_ConicalSurface) () const
-{
-  return Value();
-}
-
diff --git a/src/GC/GC_MakeCylindricalSurface.cdl b/src/GC/GC_MakeCylindricalSurface.cdl
index 725d17ee99..c904422ff3 100644
--- a/src/GC/GC_MakeCylindricalSurface.cdl
+++ b/src/GC/GC_MakeCylindricalSurface.cdl
@@ -109,11 +109,7 @@ Value(me) returns CylindricalSurface from Geom
     ---Purpose: Returns the constructed cylinder.
     -- Exceptions StdFail_NotDone if no cylinder is constructed.
     ---C++: return const&
-
-Operator(me) returns CylindricalSurface from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_CylindricalSurface() const;"
+    ---C++: alias "operator const Handle(Geom_CylindricalSurface)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeCylindricalSurface.cxx b/src/GC/GC_MakeCylindricalSurface.cxx
index 9d8a9a6177..2e81ad5172 100644
--- a/src/GC/GC_MakeCylindricalSurface.cxx
+++ b/src/GC/GC_MakeCylindricalSurface.cxx
@@ -101,13 +101,3 @@ const Handle(Geom_CylindricalSurface)&
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCylinder;
 }
-
-const Handle(Geom_CylindricalSurface)& GC_MakeCylindricalSurface::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeCylindricalSurface::operator Handle(Geom_CylindricalSurface) () const
-{
-  return Value();
-}
diff --git a/src/GC/GC_MakeEllipse.cdl b/src/GC/GC_MakeEllipse.cdl
index 9f116aeb2a..85e9962d49 100644
--- a/src/GC/GC_MakeEllipse.cdl
+++ b/src/GC/GC_MakeEllipse.cdl
@@ -72,11 +72,7 @@ Value(me) returns Ellipse from Geom
     	---Purpose: Returns the constructed ellipse.
     	-- Exceptions StdFail_NotDone if no ellipse is constructed.
         ---C++: return const&
-
-Operator(me) returns Ellipse from Geom
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom_Ellipse() const;"
+        ---C++: alias "operator const Handle(Geom_Ellipse)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeEllipse.cxx b/src/GC/GC_MakeEllipse.cxx
index 9e61d842b9..d73919cddd 100644
--- a/src/GC/GC_MakeEllipse.cxx
+++ b/src/GC/GC_MakeEllipse.cxx
@@ -51,14 +51,3 @@ const Handle(Geom_Ellipse)& GC_MakeEllipse::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheEllipse;
 }
-
-const Handle(Geom_Ellipse)& GC_MakeEllipse::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeEllipse::operator Handle(Geom_Ellipse) () const
-{
-  return Value();
-}
-
diff --git a/src/GC/GC_MakeHyperbola.cdl b/src/GC/GC_MakeHyperbola.cdl
index 58e07148a2..d41db7b7ee 100644
--- a/src/GC/GC_MakeHyperbola.cdl
+++ b/src/GC/GC_MakeHyperbola.cdl
@@ -81,11 +81,7 @@ Value(me) returns Hyperbola from Geom
     ---Purpose: Returns the constructed hyperbola.
     -- Exceptions StdFail_NotDone if no hyperbola is constructed.
     ---C++: return const&
-
-Operator(me) returns Hyperbola from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Hyperbola() const;"
+    ---C++: alias "operator const Handle(Geom_Hyperbola)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeHyperbola.cxx b/src/GC/GC_MakeHyperbola.cxx
index d9cb1999e3..7d90a6ccfd 100644
--- a/src/GC/GC_MakeHyperbola.cxx
+++ b/src/GC/GC_MakeHyperbola.cxx
@@ -50,14 +50,3 @@ const Handle(Geom_Hyperbola)& GC_MakeHyperbola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheHyperbola;
 }
-
-const Handle(Geom_Hyperbola)& GC_MakeHyperbola::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeHyperbola::operator Handle(Geom_Hyperbola) () const
-{
-  return Value();
-}
-
diff --git a/src/GC/GC_MakeLine.cdl b/src/GC/GC_MakeLine.cdl
index 356b41d5a8..78b494f54c 100644
--- a/src/GC/GC_MakeLine.cdl
+++ b/src/GC/GC_MakeLine.cdl
@@ -72,11 +72,7 @@ Value(me) returns Line from Geom
     ---Purpose:  Returns the constructed line.
     -- Exceptions StdFail_NotDone if no line is constructed.
     ---C++: return const&
-
-Operator(me) returns Line from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Line() const;"
+    ---C++: alias "operator const Handle(Geom_Line)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeLine.cxx b/src/GC/GC_MakeLine.cxx
index 617f291fea..0c3756f885 100644
--- a/src/GC/GC_MakeLine.cxx
+++ b/src/GC/GC_MakeLine.cxx
@@ -66,14 +66,3 @@ const Handle(Geom_Line)& GC_MakeLine::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheLine;
 }
-
-const Handle(Geom_Line)& GC_MakeLine::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeLine::operator Handle(Geom_Line) () const
-{
-  return Value();
-}
-
diff --git a/src/GC/GC_MakeMirror.cdl b/src/GC/GC_MakeMirror.cdl
index 97ebb46339..7cdc997ed2 100644
--- a/src/GC/GC_MakeMirror.cdl
+++ b/src/GC/GC_MakeMirror.cdl
@@ -61,11 +61,7 @@ Value(me) returns Transformation from Geom
     is static;
     ---Purpose: Returns the constructed transformation.
     ---C++: return const&
-
-Operator(me) returns Transformation from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Transformation() const;"
+    ---C++: alias "operator const Handle(Geom_Transformation)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeMirror.cxx b/src/GC/GC_MakeMirror.cxx
index c5dc1c6d58..b56d617d56 100644
--- a/src/GC/GC_MakeMirror.cxx
+++ b/src/GC/GC_MakeMirror.cxx
@@ -80,14 +80,3 @@ const Handle(Geom_Transformation)& GC_MakeMirror::Value() const
 { 
   return TheMirror;
 }
-
-const Handle(Geom_Transformation)& GC_MakeMirror::Operator() const 
-{
-  return TheMirror;
-}
-
-GC_MakeMirror::operator Handle(Geom_Transformation) () const
-{
-  return TheMirror;
-}
-
diff --git a/src/GC/GC_MakePlane.cdl b/src/GC/GC_MakePlane.cdl
index 2bfb8bf4d0..ddcaa332b0 100644
--- a/src/GC/GC_MakePlane.cdl
+++ b/src/GC/GC_MakePlane.cdl
@@ -98,11 +98,7 @@ Value(me) returns Plane from Geom
     ---Purpose: Returns the constructed plane.
     -- Exceptions StdFail_NotDone if no plane is constructed.
     ---C++: return const&
-
-Operator(me) returns Plane from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Plane() const;"
+    ---C++: alias "operator const Handle(Geom_Plane)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakePlane.cxx b/src/GC/GC_MakePlane.cxx
index 88232f5a84..ba916f122c 100644
--- a/src/GC/GC_MakePlane.cxx
+++ b/src/GC/GC_MakePlane.cxx
@@ -122,14 +122,3 @@ const Handle(Geom_Plane)& GC_MakePlane::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return ThePlane;
 }
-
-const Handle(Geom_Plane)& GC_MakePlane::Operator() const 
-{
-  return Value();
-}
-
-GC_MakePlane::operator Handle(Geom_Plane) () const
-{
-  return Value();
-}
-
diff --git a/src/GC/GC_MakeRotation.cdl b/src/GC/GC_MakeRotation.cdl
index 02d432e645..0439b2f427 100644
--- a/src/GC/GC_MakeRotation.cdl
+++ b/src/GC/GC_MakeRotation.cdl
@@ -51,11 +51,7 @@ Value(me) returns Transformation from Geom
     is static;
     ---Purpose: Returns the constructed transformation.
     ---C++: return const&
-  
-Operator(me) returns Transformation from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Transformation() const;"
+    ---C++: alias "operator const Handle(Geom_Transformation)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeRotation.cxx b/src/GC/GC_MakeRotation.cxx
index abdd4a2508..faf9f43dd0 100644
--- a/src/GC/GC_MakeRotation.cxx
+++ b/src/GC/GC_MakeRotation.cxx
@@ -56,17 +56,3 @@ const Handle(Geom_Transformation)& GC_MakeRotation::Value() const
 { 
   return TheRotation;
 }
-
-const Handle(Geom_Transformation)& GC_MakeRotation::Operator() const 
-{
-  return TheRotation;
-}
-
-GC_MakeRotation::operator Handle(Geom_Transformation) () const
-{
-  return TheRotation;
-}
-
-
-
-
diff --git a/src/GC/GC_MakeScale.cdl b/src/GC/GC_MakeScale.cdl
index c27143e590..f1470f122d 100644
--- a/src/GC/GC_MakeScale.cdl
+++ b/src/GC/GC_MakeScale.cdl
@@ -43,11 +43,7 @@ Value(me) returns Transformation from Geom
     is static;
     ---Purpose: Returns the constructed transformation.
     ---C++: return const&
-
-Operator(me) returns Transformation from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Transformation() const;"
+    ---C++: alias "operator const Handle(Geom_Transformation)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeScale.cxx b/src/GC/GC_MakeScale.cxx
index c76420f4c0..8980106962 100644
--- a/src/GC/GC_MakeScale.cxx
+++ b/src/GC/GC_MakeScale.cxx
@@ -32,14 +32,3 @@ const Handle(Geom_Transformation)& GC_MakeScale::Value() const
 { 
   return TheScale;
 }
-
-const Handle(Geom_Transformation)& GC_MakeScale::Operator() const 
-{
-  return TheScale;
-}
-
-GC_MakeScale::operator Handle(Geom_Transformation) () const
-{
-  return TheScale;
-}
-
diff --git a/src/GC/GC_MakeSegment.cdl b/src/GC/GC_MakeSegment.cdl
index ca6dcc0456..be848124cd 100644
--- a/src/GC/GC_MakeSegment.cdl
+++ b/src/GC/GC_MakeSegment.cdl
@@ -64,11 +64,7 @@ Value(me) returns TrimmedCurve from Geom
     is static;
     	---Purpose: Returns the constructed line segment.
     	---C++: return const&
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeSegment.cxx b/src/GC/GC_MakeSegment.cxx
index 35589b637b..e5e6d05e1d 100644
--- a/src/GC/GC_MakeSegment.cxx
+++ b/src/GC/GC_MakeSegment.cxx
@@ -64,14 +64,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeSegment::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheSegment;
 }
-
-const Handle(Geom_TrimmedCurve)& GC_MakeSegment::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeSegment::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-
diff --git a/src/GC/GC_MakeTranslation.cdl b/src/GC/GC_MakeTranslation.cdl
index f87647128a..55f33e6479 100644
--- a/src/GC/GC_MakeTranslation.cdl
+++ b/src/GC/GC_MakeTranslation.cdl
@@ -44,11 +44,7 @@ Value(me) returns Transformation from Geom
     is static;
     	---Purpose:  Returns the constructed transformation.
     	---C++: return const&
-
-Operator(me) returns Transformation from Geom
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom_Transformation() const;"
+        ---C++: alias "operator const Handle(Geom_Transformation)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeTranslation.cxx b/src/GC/GC_MakeTranslation.cxx
index 4959b18b95..454814035d 100644
--- a/src/GC/GC_MakeTranslation.cxx
+++ b/src/GC/GC_MakeTranslation.cxx
@@ -42,14 +42,3 @@ const Handle(Geom_Transformation)& GC_MakeTranslation::Value() const
 { 
   return TheTranslation;
 }
-
-const Handle(Geom_Transformation)& GC_MakeTranslation::Operator() const 
-{
-  return TheTranslation;
-}
-
-GC_MakeTranslation::operator Handle(Geom_Transformation) () const
-{
-  return TheTranslation;
-}
-
diff --git a/src/GC/GC_MakeTrimmedCone.cdl b/src/GC/GC_MakeTrimmedCone.cdl
index 73bb4cdcd7..e328c30831 100644
--- a/src/GC/GC_MakeTrimmedCone.cdl
+++ b/src/GC/GC_MakeTrimmedCone.cdl
@@ -71,11 +71,7 @@ Value(me) returns RectangularTrimmedSurface from Geom
     ---Purpose: Returns the constructed trimmed cone.
     -- StdFail_NotDone if no trimmed cone is constructed.
     ---C++: return const&
-
-Operator(me) returns RectangularTrimmedSurface from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_RectangularTrimmedSurface() const;"
+    ---C++: alias "operator const Handle(Geom_RectangularTrimmedSurface)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeTrimmedCone.cxx b/src/GC/GC_MakeTrimmedCone.cxx
index a4beefe72d..e226ff3ddb 100644
--- a/src/GC/GC_MakeTrimmedCone.cxx
+++ b/src/GC/GC_MakeTrimmedCone.cxx
@@ -76,16 +76,3 @@ const Handle(Geom_RectangularTrimmedSurface)& GC_MakeTrimmedCone::
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCone;
 }
-
-const Handle(Geom_RectangularTrimmedSurface)& GC_MakeTrimmedCone::
-       Operator() const 
-{
-  return Value();
-}
-
-GC_MakeTrimmedCone::
-  operator Handle(Geom_RectangularTrimmedSurface) () const
-{
-  return Value();
-}
-
diff --git a/src/GC/GC_MakeTrimmedCylinder.cdl b/src/GC/GC_MakeTrimmedCylinder.cdl
index 1e59fc1aa4..08198897fa 100644
--- a/src/GC/GC_MakeTrimmedCylinder.cdl
+++ b/src/GC/GC_MakeTrimmedCylinder.cdl
@@ -93,11 +93,7 @@ Value(me) returns RectangularTrimmedSurface from Geom
     -- Exceptions
     -- StdFail_NotDone if no trimmed cylinder is constructed.
     ---C++: return const&
-
-Operator(me) returns RectangularTrimmedSurface from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_RectangularTrimmedSurface() const;"
+    ---C++: alias "operator const Handle(Geom_RectangularTrimmedSurface)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GC/GC_MakeTrimmedCylinder.cxx b/src/GC/GC_MakeTrimmedCylinder.cxx
index 2aac425b11..e918eb49de 100644
--- a/src/GC/GC_MakeTrimmedCylinder.cxx
+++ b/src/GC/GC_MakeTrimmedCylinder.cxx
@@ -18,6 +18,7 @@
 #include <GC_MakeCylindricalSurface.hxx>
 #include <StdFail_NotDone.hxx>
 #include <Standard_NotImplemented.hxx>
+#include <Geom_CylindricalSurface.hxx>
 
 //=========================================================================
 //   Creation of a cylinder limited by three points <P1>, <P2> and <P3>.         +
@@ -85,16 +86,3 @@ const Handle(Geom_RectangularTrimmedSurface)& GC_MakeTrimmedCylinder::
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCyl;
 }
-
-const Handle(Geom_RectangularTrimmedSurface)& GC_MakeTrimmedCylinder::
-       Operator() const 
-{
-  return Value();
-}
-
-GC_MakeTrimmedCylinder::
-  operator Handle(Geom_RectangularTrimmedSurface) () const
-{
-  return Value();
-}
-
diff --git a/src/GCE2d/GCE2d_MakeArcOfCircle.cdl b/src/GCE2d/GCE2d_MakeArcOfCircle.cdl
index 23215acb5e..17b8598ff2 100644
--- a/src/GCE2d/GCE2d_MakeArcOfCircle.cdl
+++ b/src/GCE2d/GCE2d_MakeArcOfCircle.cdl
@@ -82,11 +82,7 @@ Value(me) returns TrimmedCurve from Geom2d
     	---C++: return const&
     	---Purpose: Returns the constructed arc of circle.
     	-- Exceptions StdFail_NotDone if no arc of circle is constructed.
-
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GCE2d/GCE2d_MakeArcOfCircle.cxx b/src/GCE2d/GCE2d_MakeArcOfCircle.cxx
index 0988646caa..4bf7aa10c6 100644
--- a/src/GCE2d/GCE2d_MakeArcOfCircle.cxx
+++ b/src/GCE2d/GCE2d_MakeArcOfCircle.cxx
@@ -114,14 +114,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfCircle::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfCircle::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeArcOfCircle::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-
diff --git a/src/GCE2d/GCE2d_MakeArcOfEllipse.cdl b/src/GCE2d/GCE2d_MakeArcOfEllipse.cdl
index 0565988289..c63daf694f 100644
--- a/src/GCE2d/GCE2d_MakeArcOfEllipse.cdl
+++ b/src/GCE2d/GCE2d_MakeArcOfEllipse.cdl
@@ -68,11 +68,7 @@ Value(me) returns TrimmedCurve from Geom2d
     is static;
      	---C++: return const&
      	---Purpose: Returns the constructed arc of ellipse.
-
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GCE2d/GCE2d_MakeArcOfEllipse.cxx b/src/GCE2d/GCE2d_MakeArcOfEllipse.cxx
index 07fbd2fcfc..08a89b7e0e 100644
--- a/src/GCE2d/GCE2d_MakeArcOfEllipse.cxx
+++ b/src/GCE2d/GCE2d_MakeArcOfEllipse.cxx
@@ -57,17 +57,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfEllipse::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfEllipse::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeArcOfEllipse::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-
-
-
-
diff --git a/src/GCE2d/GCE2d_MakeArcOfHyperbola.cdl b/src/GCE2d/GCE2d_MakeArcOfHyperbola.cdl
index 8b2838b138..ce112a08cf 100644
--- a/src/GCE2d/GCE2d_MakeArcOfHyperbola.cdl
+++ b/src/GCE2d/GCE2d_MakeArcOfHyperbola.cdl
@@ -67,11 +67,7 @@ Value(me) returns TrimmedCurve from Geom2d
     is static;
     	---C++: return const&
     	---Purpose: Returns the constructed arc of hyperbola.
-
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GCE2d/GCE2d_MakeArcOfHyperbola.cxx b/src/GCE2d/GCE2d_MakeArcOfHyperbola.cxx
index d981da8a58..18c383bd66 100644
--- a/src/GCE2d/GCE2d_MakeArcOfHyperbola.cxx
+++ b/src/GCE2d/GCE2d_MakeArcOfHyperbola.cxx
@@ -59,14 +59,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfHyperbola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfHyperbola::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeArcOfHyperbola::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-
diff --git a/src/GCE2d/GCE2d_MakeArcOfParabola.cdl b/src/GCE2d/GCE2d_MakeArcOfParabola.cdl
index b39d734a31..15627a026a 100644
--- a/src/GCE2d/GCE2d_MakeArcOfParabola.cdl
+++ b/src/GCE2d/GCE2d_MakeArcOfParabola.cdl
@@ -67,11 +67,7 @@ Value(me) returns TrimmedCurve from Geom2d
     is static;
     	---C++: return const&
     	---Purpose: Returns the constructed arc of parabola.
-    
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GCE2d/GCE2d_MakeArcOfParabola.cxx b/src/GCE2d/GCE2d_MakeArcOfParabola.cxx
index 613e6e2503..8e23469d9e 100644
--- a/src/GCE2d/GCE2d_MakeArcOfParabola.cxx
+++ b/src/GCE2d/GCE2d_MakeArcOfParabola.cxx
@@ -58,14 +58,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfParabola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfParabola::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeArcOfParabola::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-
diff --git a/src/GCE2d/GCE2d_MakeCircle.cdl b/src/GCE2d/GCE2d_MakeCircle.cdl
index f936b45cd9..ce184ae580 100644
--- a/src/GCE2d/GCE2d_MakeCircle.cdl
+++ b/src/GCE2d/GCE2d_MakeCircle.cdl
@@ -104,11 +104,7 @@ Value(me) returns Circle from Geom2d
     ---C++: return const&
     ---Purpose: Returns the constructed circle.
     -- Exceptions StdFail_NotDone if no circle is constructed.
-
-Operator(me) returns Circle from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Circle() const;"
+    ---C++: alias "operator const Handle(Geom2d_Circle)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GCE2d/GCE2d_MakeCircle.cxx b/src/GCE2d/GCE2d_MakeCircle.cxx
index d8058e7041..2da522ad73 100644
--- a/src/GCE2d/GCE2d_MakeCircle.cxx
+++ b/src/GCE2d/GCE2d_MakeCircle.cxx
@@ -103,14 +103,3 @@ const Handle(Geom2d_Circle)& GCE2d_MakeCircle::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCircle;
 }
-
-const Handle(Geom2d_Circle)& GCE2d_MakeCircle::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeCircle::operator Handle(Geom2d_Circle) () const
-{
-  return Value();
-}
-
diff --git a/src/GCE2d/GCE2d_MakeEllipse.cdl b/src/GCE2d/GCE2d_MakeEllipse.cdl
index 7db14ad90b..965cfaef94 100644
--- a/src/GCE2d/GCE2d_MakeEllipse.cdl
+++ b/src/GCE2d/GCE2d_MakeEllipse.cdl
@@ -86,11 +86,7 @@ Value(me) returns Ellipse from Geom2d
     ---C++: return const&
     ---Purpose: Returns the constructed ellipse.
     -- Exceptions StdFail_NotDone if no ellipse is constructed.
-    
-Operator(me) returns Ellipse from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Ellipse() const;"
+    ---C++: alias "operator const Handle(Geom2d_Ellipse)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GCE2d/GCE2d_MakeEllipse.cxx b/src/GCE2d/GCE2d_MakeEllipse.cxx
index 4800102d74..29dccf8a47 100644
--- a/src/GCE2d/GCE2d_MakeEllipse.cxx
+++ b/src/GCE2d/GCE2d_MakeEllipse.cxx
@@ -62,14 +62,3 @@ const Handle(Geom2d_Ellipse)& GCE2d_MakeEllipse::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheEllipse;
 }
-
-const Handle(Geom2d_Ellipse)& GCE2d_MakeEllipse::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeEllipse::operator Handle(Geom2d_Ellipse) () const
-{
-  return Value();
-}
-
diff --git a/src/GCE2d/GCE2d_MakeHyperbola.cdl b/src/GCE2d/GCE2d_MakeHyperbola.cdl
index cf7cb9c402..578a35260d 100644
--- a/src/GCE2d/GCE2d_MakeHyperbola.cdl
+++ b/src/GCE2d/GCE2d_MakeHyperbola.cdl
@@ -106,11 +106,7 @@ Value(me) returns Hyperbola from Geom2d
     ---C++: return const&
     ---Purpose: Returns the constructed hyperbola.
     -- Exceptions: StdFail_NotDone if no hyperbola is constructed.
-    
-Operator(me) returns Hyperbola from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Hyperbola() const;"
+    ---C++: alias "operator const Handle(Geom2d_Hyperbola)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GCE2d/GCE2d_MakeHyperbola.cxx b/src/GCE2d/GCE2d_MakeHyperbola.cxx
index 714edf30ee..377c53afbc 100644
--- a/src/GCE2d/GCE2d_MakeHyperbola.cxx
+++ b/src/GCE2d/GCE2d_MakeHyperbola.cxx
@@ -62,14 +62,3 @@ const Handle(Geom2d_Hyperbola)& GCE2d_MakeHyperbola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheHyperbola;
 }
-
-const Handle(Geom2d_Hyperbola)& GCE2d_MakeHyperbola::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeHyperbola::operator Handle(Geom2d_Hyperbola) () const
-{
-  return Value();
-}
-
diff --git a/src/GCE2d/GCE2d_MakeLine.cdl b/src/GCE2d/GCE2d_MakeLine.cdl
index 0b59b541e7..61cc414d44 100644
--- a/src/GCE2d/GCE2d_MakeLine.cdl
+++ b/src/GCE2d/GCE2d_MakeLine.cdl
@@ -72,11 +72,7 @@ Value(me) returns Line from Geom2d
     ---C++: return const&
     ---Purpose: Returns the constructed line.
     -- Exceptions StdFail_NotDone if no line is constructed.
-
-Operator(me) returns Line from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Line() const;"
+    ---C++: alias "operator const Handle(Geom2d_Line)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GCE2d/GCE2d_MakeLine.cxx b/src/GCE2d/GCE2d_MakeLine.cxx
index a3122da17e..2a4aadd632 100644
--- a/src/GCE2d/GCE2d_MakeLine.cxx
+++ b/src/GCE2d/GCE2d_MakeLine.cxx
@@ -76,14 +76,3 @@ const Handle(Geom2d_Line)& GCE2d_MakeLine::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheLine;
 }
-
-const Handle(Geom2d_Line) & GCE2d_MakeLine::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeLine::operator Handle(Geom2d_Line) () const
-{
-  return Value();
-}
-
diff --git a/src/GCE2d/GCE2d_MakeMirror.cdl b/src/GCE2d/GCE2d_MakeMirror.cdl
index 54875dad10..bbb724f37b 100644
--- a/src/GCE2d/GCE2d_MakeMirror.cdl
+++ b/src/GCE2d/GCE2d_MakeMirror.cdl
@@ -53,11 +53,7 @@ Value(me) returns Transformation from Geom2d
     is static;
     ---C++: return const&
     ---Purpose: Returns the constructed transformation.
-
-Operator(me) returns Transformation from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Transformation() const;"
+    ---C++: alias "operator const Handle(Geom2d_Transformation)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GCE2d/GCE2d_MakeMirror.cxx b/src/GCE2d/GCE2d_MakeMirror.cxx
index 5b4e876f80..bf70a677e3 100644
--- a/src/GCE2d/GCE2d_MakeMirror.cxx
+++ b/src/GCE2d/GCE2d_MakeMirror.cxx
@@ -58,14 +58,3 @@ const Handle(Geom2d_Transformation)& GCE2d_MakeMirror::Value() const
 { 
   return TheMirror;
 }
-
-const Handle(Geom2d_Transformation)& GCE2d_MakeMirror::Operator() const 
-{
-  return TheMirror;
-}
-
-GCE2d_MakeMirror::operator Handle(Geom2d_Transformation) () const
-{
-  return TheMirror;
-}
-
diff --git a/src/GCE2d/GCE2d_MakeParabola.cdl b/src/GCE2d/GCE2d_MakeParabola.cdl
index 9f1950f2fc..91e99f8458 100644
--- a/src/GCE2d/GCE2d_MakeParabola.cdl
+++ b/src/GCE2d/GCE2d_MakeParabola.cdl
@@ -102,11 +102,7 @@ Value(me) returns Parabola from Geom2d
     	---C++: return const&
     	---Purpose: Returns the constructed parabola.
     	-- Exceptions StdFail_NotDone if no parabola is constructed.
-    
-Operator(me) returns Parabola from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_Parabola() const;"
+        ---C++: alias "operator const Handle(Geom2d_Parabola)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GCE2d/GCE2d_MakeParabola.cxx b/src/GCE2d/GCE2d_MakeParabola.cxx
index 381ee1f680..529417db4a 100644
--- a/src/GCE2d/GCE2d_MakeParabola.cxx
+++ b/src/GCE2d/GCE2d_MakeParabola.cxx
@@ -77,14 +77,3 @@ const Handle(Geom2d_Parabola)& GCE2d_MakeParabola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheParabola;
 }
-
-const Handle(Geom2d_Parabola)& GCE2d_MakeParabola::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeParabola::operator Handle(Geom2d_Parabola) () const
-{
-  return Value();
-}
-
diff --git a/src/GCE2d/GCE2d_MakeRotation.cdl b/src/GCE2d/GCE2d_MakeRotation.cdl
index d998b1ca5c..f2f8e8d20c 100644
--- a/src/GCE2d/GCE2d_MakeRotation.cdl
+++ b/src/GCE2d/GCE2d_MakeRotation.cdl
@@ -39,11 +39,7 @@ Value(me) returns Transformation from Geom2d
     is static;
       	---C++: return const&
       	---Purpose:  Returns the constructed transformation.
-
-Operator(me) returns Transformation from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_Transformation() const;"
+        ---C++: alias "operator const Handle(Geom2d_Transformation)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GCE2d/GCE2d_MakeRotation.cxx b/src/GCE2d/GCE2d_MakeRotation.cxx
index dfd92761ef..5990d352b6 100644
--- a/src/GCE2d/GCE2d_MakeRotation.cxx
+++ b/src/GCE2d/GCE2d_MakeRotation.cxx
@@ -31,17 +31,3 @@ const Handle(Geom2d_Transformation)& GCE2d_MakeRotation::Value() const
 { 
   return TheRotation;
 }
-
-const Handle(Geom2d_Transformation)& GCE2d_MakeRotation::Operator() const 
-{
-  return TheRotation;
-}
-
-GCE2d_MakeRotation::operator Handle(Geom2d_Transformation) () const
-{
-  return TheRotation;
-}
-
-
-
-
diff --git a/src/GCE2d/GCE2d_MakeScale.cdl b/src/GCE2d/GCE2d_MakeScale.cdl
index 951dd403f8..f2639ea969 100644
--- a/src/GCE2d/GCE2d_MakeScale.cdl
+++ b/src/GCE2d/GCE2d_MakeScale.cdl
@@ -42,11 +42,7 @@ Value(me) returns Transformation from Geom2d
     is static;
      	---C++: return const&
      	---Purpose: Returns the constructed transformation.
-
-Operator(me) returns Transformation from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_Transformation() const;"
+        ---C++: alias "operator const Handle(Geom2d_Transformation)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GCE2d/GCE2d_MakeScale.cxx b/src/GCE2d/GCE2d_MakeScale.cxx
index b44cb5faec..0cfb2637c5 100644
--- a/src/GCE2d/GCE2d_MakeScale.cxx
+++ b/src/GCE2d/GCE2d_MakeScale.cxx
@@ -30,14 +30,3 @@ const Handle(Geom2d_Transformation)& GCE2d_MakeScale::Value() const
 { 
   return TheScale;
 }
-
-const Handle(Geom2d_Transformation)& GCE2d_MakeScale::Operator() const 
-{
-  return TheScale;
-}
-
-GCE2d_MakeScale::operator Handle(Geom2d_Transformation) () const
-{
-  return TheScale;
-}
-
diff --git a/src/GCE2d/GCE2d_MakeSegment.cdl b/src/GCE2d/GCE2d_MakeSegment.cdl
index 755ce7c2ff..6b783ce076 100644
--- a/src/GCE2d/GCE2d_MakeSegment.cdl
+++ b/src/GCE2d/GCE2d_MakeSegment.cdl
@@ -80,11 +80,7 @@ Value(me) returns TrimmedCurve from Geom2d
       	---C++: return const&
       	---Purpose: Returns the constructed line segment.
       	-- Exceptions StdFail_NotDone if no line segment is constructed.
-
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-    	---C++: return const&
-    	---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GCE2d/GCE2d_MakeSegment.cxx b/src/GCE2d/GCE2d_MakeSegment.cxx
index 406017816b..06de6232c3 100644
--- a/src/GCE2d/GCE2d_MakeSegment.cxx
+++ b/src/GCE2d/GCE2d_MakeSegment.cxx
@@ -80,14 +80,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeSegment::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheSegment;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeSegment::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeSegment::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-
diff --git a/src/GCE2d/GCE2d_MakeTranslation.cdl b/src/GCE2d/GCE2d_MakeTranslation.cdl
index 18adcf4f12..5f722f9561 100644
--- a/src/GCE2d/GCE2d_MakeTranslation.cdl
+++ b/src/GCE2d/GCE2d_MakeTranslation.cdl
@@ -45,11 +45,7 @@ Value(me) returns Transformation from Geom2d
     is static;
        ---C++: return const&
        ---Purpose: Returns the constructed transformation.
-    
-Operator(me) returns Transformation from Geom2d
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Transformation() const;"
+        ---C++: alias "operator const Handle(Geom2d_Transformation)& () const { return Value(); }"
 
 fields
 
diff --git a/src/GCE2d/GCE2d_MakeTranslation.cxx b/src/GCE2d/GCE2d_MakeTranslation.cxx
index 0413d621ca..f46d4ed638 100644
--- a/src/GCE2d/GCE2d_MakeTranslation.cxx
+++ b/src/GCE2d/GCE2d_MakeTranslation.cxx
@@ -40,14 +40,3 @@ const Handle(Geom2d_Transformation)& GCE2d_MakeTranslation::Value() const
 { 
   return TheTranslation;
 }
-
-const Handle(Geom2d_Transformation)& GCE2d_MakeTranslation::Operator() const 
-{
-  return TheTranslation;
-}
-
-GCE2d_MakeTranslation::operator Handle(Geom2d_Transformation) () const
-{
-  return TheTranslation;
-}
-