@@ -17,61 +17,57 @@
 # exported items, these also makes them show in pydoc.
 __all__ = ["BondCalculator"]
 
-from diffpy.srreal.srreal_ext import BondCalculator
+from diffpy.srreal.srreal_ext import BondCalculator as _BondCalculator
 from diffpy.srreal.wraputils import (
     propertyFromExtDoubleAttr,
     setattrFromKeywordArguments,
 )
 
-# property wrappers to C++ double attributes
-
-BondCalculator.rmin = propertyFromExtDoubleAttr(
-    "rmin",
-    "Lower bound for the bond distances. [0 A]",
-)
-
-BondCalculator.rmax = propertyFromExtDoubleAttr(
-    "rmax",
-    "Upper bound for the bond distances. [5 A]",
-)
 
+class BondCalculator(_BondCalculator):
+    __doc__ = _BondCalculator.__doc__
 
-# method overrides that support keyword arguments
+    def __init__(self, **kwargs):
+        """Create a new instance of BondCalculator. Keyword arguments can be
+        used to configure calculator properties, for example:
 
+        bdc = BondCalculator(rmin=1.5, rmax=2.5)
 
-def _init_kwargs(self, **kwargs):
-    """Create a new instance of BondCalculator. Keyword arguments can be
-    used to configure calculator properties, for example:
+        Raise ValueError for invalid keyword argument.
+        """
+        super().__init__()
+        setattrFromKeywordArguments(self, **kwargs)
+        return
 
-    bdc = BondCalculator(rmin=1.5, rmax=2.5)
+    def __call__(self, structure=None, **kwargs):
+        """Return sorted bond distances in the specified structure.
 
-    Raise ValueError for invalid keyword argument.
-    """
-    BondCalculator.__boostpython__init(self)
-    setattrFromKeywordArguments(self, **kwargs)
-    return
+        Attributes
+        ----------
+        structure
+            structure to be evaluated, an instance of diffpy Structure
+            or pyobjcryst Crystal.  Reuse the last structure when None.
+        kwargs
+            optional parameter settings for this calculator
 
+        Return a sorted numpy array.
+        """
+        setattrFromKeywordArguments(self, **kwargs)
+        self.eval(structure)
+        return self.distances
 
-def _call_kwargs(self, structure=None, **kwargs):
-    """Return sorted bond distances in the specified structure.
 
-    Attributes
-    ----------
-    structure
-        structure to be evaluated, an instance of diffpy Structure
-        or pyobjcryst Crystal.  Reuse the last structure when None.
-    kwargs
-        optional parameter settings for this calculator
+# property wrappers to C++ double attributes
 
-    Return a sorted numpy array.
-    """
-    setattrFromKeywordArguments(self, **kwargs)
-    self.eval(structure)
-    return self.distances
+BondCalculator.rmin = propertyFromExtDoubleAttr(
+    "rmin",
+    "Lower bound for the bond distances. [0 A]",
+)
 
+BondCalculator.rmax = propertyFromExtDoubleAttr(
+    "rmax",
+    "Upper bound for the bond distances. [5 A]",
+)
 
-BondCalculator.__boostpython__init = BondCalculator.__init__
-BondCalculator.__init__ = _init_kwargs
-BondCalculator.__call__ = _call_kwargs
 
 # End of file
@@ -17,12 +17,48 @@
 # exported items
 __all__ = ["BVSCalculator"]
 
-from diffpy.srreal.srreal_ext import BVSCalculator
+from diffpy.srreal.srreal_ext import BVSCalculator as _BVSCalculator
 from diffpy.srreal.wraputils import (
     propertyFromExtDoubleAttr,
     setattrFromKeywordArguments,
 )
 
+
+class BVSCalculator(_BVSCalculator):
+    __doc__ = _BVSCalculator.__doc__
+
+    def __init__(self, **kwargs):
+        """Create a new instance of BVSCalculator.
+        Keyword arguments can be used to configure the calculator properties,
+        for example:
+
+        bvscalc = BVSCalculator(valenceprecision=0.001)
+
+        Raise ValueError for invalid keyword argument.
+        """
+        super().__init__()
+        setattrFromKeywordArguments(self, **kwargs)
+        return
+
+    def __call__(self, structure=None, **kwargs):
+        """Return bond valence sums at each atom site in the structure.
+
+        Attributes
+        ----------
+        structure
+            structure to be evaluated, an instance of diffpy Structure
+            or pyobjcryst Crystal.  Reuse the last structure when None.
+        kwargs
+            optional parameter settings for this calculator
+
+        Return an array of calculated valence sums.
+        See valences for the expected values.
+        """
+        setattrFromKeywordArguments(self, **kwargs)
+        rv = self.eval(structure)
+        return rv
+
+
 # Property wrappers to C++ double attributes
 
 BVSCalculator.valenceprecision = propertyFromExtDoubleAttr(
@@ -56,44 +92,4 @@
 )
 
 
-# method overrides that support keyword arguments
-
-
-def _init_kwargs(self, **kwargs):
-    """Create a new instance of BVSCalculator.
-    Keyword arguments can be used to configure the calculator properties,
-    for example:
-
-    bvscalc = BVSCalculator(valenceprecision=0.001)
-
-    Raise ValueError for invalid keyword argument.
-    """
-    BVSCalculator.__boostpython__init(self)
-    setattrFromKeywordArguments(self, **kwargs)
-    return
-
-
-def _call_kwargs(self, structure=None, **kwargs):
-    """Return bond valence sums at each atom site in the structure.
-
-    Attributes
-    ----------
-    structure
-        structure to be evaluated, an instance of diffpy Structure
-        or pyobjcryst Crystal.  Reuse the last structure when None.
-    kwargs
-        optional parameter settings for this calculator
-
-    Return an array of calculated valence sums.
-    See valences for the expected values.
-    """
-    setattrFromKeywordArguments(self, **kwargs)
-    rv = self.eval(structure)
-    return rv
-
-
-BVSCalculator.__boostpython__init = BVSCalculator.__init__
-BVSCalculator.__init__ = _init_kwargs
-BVSCalculator.__call__ = _call_kwargs
-
 # End of file
@@ -18,12 +18,46 @@
 # exported items, these also makes them show in pydoc.
 __all__ = ["OverlapCalculator"]
 
-from diffpy.srreal.srreal_ext import OverlapCalculator
+from diffpy.srreal.srreal_ext import OverlapCalculator as _OverlapCalculator
 from diffpy.srreal.wraputils import (
     propertyFromExtDoubleAttr,
     setattrFromKeywordArguments,
 )
 
+
+class OverlapCalculator(_OverlapCalculator):
+    __doc__ = _OverlapCalculator.__doc__
+
+    def __init__(self, **kwargs):
+        """Create a new instance of OverlapCalculator. Keyword arguments can
+        be used to configure calculator properties, for example:
+
+        olc = OverlapCalculator(rmax=2.5)
+
+        Raise ValueError for invalid keyword argument.
+        """
+        super().__init__()
+        setattrFromKeywordArguments(self, **kwargs)
+        return
+
+    def __call__(self, structure=None, **kwargs):
+        """Return siteSquareOverlaps per each site of the structure.
+
+        Attributes
+        ----------
+        structure
+            structure to be evaluated, an instance of diffpy Structure
+            or pyobjcryst Crystal.  Reuse the last structure when None.
+        kwargs
+            optional parameter settings for this calculator
+
+        Return a numpy array.
+        """
+        setattrFromKeywordArguments(self, **kwargs)
+        self.eval(structure)
+        return self.sitesquareoverlaps
+
+
 # property wrappers to C++ double attributes
 
 OverlapCalculator.rmin = propertyFromExtDoubleAttr(
@@ -45,42 +79,4 @@
     ),
 )
 
-# method overrides that support keyword arguments
-
-
-def _init_kwargs(self, **kwargs):
-    """Create a new instance of OverlapCalculator. Keyword arguments can
-    be used to configure calculator properties, for example:
-
-    olc = OverlapCalculator(rmax=2.5)
-
-    Raise ValueError for invalid keyword argument.
-    """
-    OverlapCalculator.__boostpython__init(self)
-    setattrFromKeywordArguments(self, **kwargs)
-    return
-
-
-def _call_kwargs(self, structure=None, **kwargs):
-    """Return siteSquareOverlaps per each site of the structure.
-
-    Attributes
-    ----------
-    structure
-        structure to be evaluated, an instance of diffpy Structure
-        or pyobjcryst Crystal.  Reuse the last structure when None.
-    kwargs
-        optional parameter settings for this calculator
-
-    Return a numpy array.
-    """
-    setattrFromKeywordArguments(self, **kwargs)
-    self.eval(structure)
-    return self.sitesquareoverlaps
-
-
-OverlapCalculator.__boostpython__init = OverlapCalculator.__init__
-OverlapCalculator.__init__ = _init_kwargs
-OverlapCalculator.__call__ = _call_kwargs
-
 # End of file
@@ -19,8 +19,8 @@
 """
 
 from diffpy.srreal.srreal_ext import (
-    DebyePDFCalculator,
-    PDFCalculator,
+    DebyePDFCalculator as _DebyePDFCalculator,
+    PDFCalculator as _PDFCalculator,
     fftftog,
     fftgtof,
 )
@@ -195,6 +195,23 @@ def _call_kwargs(self, structure=None, **kwargs):
 
 # class DebyePDFCalculator ---------------------------------------------------
 
+class DebyePDFCalculator(_DebyePDFCalculator):
+    __doc__ = _DebyePDFCalculator.__doc__
+
+    def __init__(self, **kwargs):
+        """Create a new instance of the DebyePDFCalculator.
+        Keyword arguments can be used to configure the calculator properties,
+        for example:
+
+        dpc = DebyePDFCalculator(qmax=20, rmin=7, rmax=15)
+
+        Raise ValueError for invalid keyword argument.
+        """
+        super().__init__()
+        setattrFromKeywordArguments(self, **kwargs)
+        return
+
+
 # shared interface of the PDF calculator classes
 
 _defineCommonInterface(DebyePDFCalculator)
@@ -230,28 +247,26 @@ def _call_kwargs(self, structure=None, **kwargs):
     ),
 )
 
-# method overrides to support optional keyword arguments
-
+# End of class DebyePDFCalculator
 
-def _init_kwargs0(self, **kwargs):
-    """Create a new instance of the DebyePDFCalculator.
-    Keyword arguments can be used to configure the calculator properties,
-    for example:
+# PDFCalculator --------------------------------------------------------------
 
-    dpc = DebyePDFCalculator(qmax=20, rmin=7, rmax=15)
+class PDFCalculator(_PDFCalculator):
+    __doc__ = _PDFCalculator.__doc__
 
-    Raise ValueError for invalid keyword argument.
-    """
-    DebyePDFCalculator.__boostpython__init(self)
-    setattrFromKeywordArguments(self, **kwargs)
-    return
+    def __init__(self, **kwargs):
+        """Create a new instance of PDFCalculator.
+        Keyword arguments can be used to configure the calculator properties,
+        for example:
 
+        pc = PDFCalculator(qmax=20, rmin=7, rmax=15)
 
-DebyePDFCalculator.__boostpython__init = DebyePDFCalculator.__init__
-DebyePDFCalculator.__init__ = _init_kwargs0
-# End of class DebyePDFCalculator
+        Raise ValueError for invalid keyword argument.
+        """
+        super().__init__()
+        setattrFromKeywordArguments(self, **kwargs)
+        return
 
-# PDFCalculator --------------------------------------------------------------
 
 # shared interface of the PDF calculator classes
 
@@ -319,26 +334,6 @@ def _init_kwargs0(self, **kwargs):
     ),
 )
 
-# method overrides to support optional keyword arguments
-
-
-def _init_kwargs1(self, **kwargs):
-    """Create a new instance of PDFCalculator.
-    Keyword arguments can be used to configure the calculator properties,
-    for example:
-
-    pc = PDFCalculator(qmax=20, rmin=7, rmax=15)
-
-    Raise ValueError for invalid keyword argument.
-    """
-    PDFCalculator.__boostpython__init(self)
-    setattrFromKeywordArguments(self, **kwargs)
-    return
-
-
-PDFCalculator.__boostpython__init = PDFCalculator.__init__
-PDFCalculator.__init__ = _init_kwargs1
-
 # End of class PDFCalculator
 
 # End of file