diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Concat.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Concat.1.py
index edb7db4b..472ba2c6 100644
--- a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Concat.1.py
+++ b/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Concat.1.py
@@ -1,4 +1,4 @@
     
-            #           | t.self.11  t.self.12  0 |   | self.11  self.12   0 |
-            # matrix' = | t.self.21  t.self.22  0 | x | self.21  self.22   0 |
-            #           | t.self.tx  t.self.ty  1 |   | self.tx  self.ty   1 |
+            #           | t.m_11  t.m_12  0 |   | m_11  m_12   0 |
+            # matrix' = | t.m_21  t.m_22  0 | x | m_21  m_22   0 |
+            #           | t.m_tx  t.m_ty  1 |   | m_tx  m_ty   1 |
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Invert.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Invert.1.py
index d45fc476..ff50ba9f 100644
--- a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Invert.1.py
+++ b/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Invert.1.py
@@ -1,4 +1,4 @@
     
-            #           | self.11  self.12  0 |
-            # Invert    | self.21  self.22  0 |
-            #           | self.tx  self.ty  1 |
+            #           | m_11  m_12  0 |
+            # Invert    | m_21  m_22  0 |
+            #           | m_tx  m_ty  1 |
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2DBase.Concat.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2DBase.Concat.1.py
index edb7db4b..472ba2c6 100644
--- a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2DBase.Concat.1.py
+++ b/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2DBase.Concat.1.py
@@ -1,4 +1,4 @@
     
-            #           | t.self.11  t.self.12  0 |   | self.11  self.12   0 |
-            # matrix' = | t.self.21  t.self.22  0 | x | self.21  self.22   0 |
-            #           | t.self.tx  t.self.ty  1 |   | self.tx  self.ty   1 |
+            #           | t.m_11  t.m_12  0 |   | m_11  m_12   0 |
+            # matrix' = | t.m_21  t.m_22  0 | x | m_21  m_22   0 |
+            #           | t.m_tx  t.m_ty  1 |   | m_tx  m_ty   1 |
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2DBase.Invert.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2DBase.Invert.1.py
index d45fc476..ff50ba9f 100644
--- a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2DBase.Invert.1.py
+++ b/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2DBase.Invert.1.py
@@ -1,4 +1,4 @@
     
-            #           | self.11  self.12  0 |
-            # Invert    | self.21  self.22  0 |
-            #           | self.tx  self.ty  1 |
+            #           | m_11  m_12  0 |
+            # Invert    | m_21  m_22  0 |
+            #           | m_tx  m_ty  1 |
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/LogChain.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/LogChain.1.py
index 54f40b3b..2012dea8 100644
--- a/docs/sphinx/rest_substitutions/snippets/python/converted/LogChain.1.py
+++ b/docs/sphinx/rest_substitutions/snippets/python/converted/LogChain.1.py
@@ -3,5 +3,5 @@
     
         # all the log messages are sent to stderr and also processed as usually
     
-        # don't delete logChain directly as self would leave a dangling
+        # don't delete logChain directly as this would leave a dangling
         # pointer as active log target, use SetActiveTarget() instead
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/MemoryDC.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/MemoryDC.1.py
index cad5cfc5..af51368c 100644
--- a/docs/sphinx/rest_substitutions/snippets/python/converted/MemoryDC.1.py
+++ b/docs/sphinx/rest_substitutions/snippets/python/converted/MemoryDC.1.py
@@ -4,5 +4,5 @@
         temp_dc.SelectObject(test_bitmap)
     
         # We can now draw into the memory DC...
-        # Copy from self DC to another DC.
+        # Copy from this DC to another DC.
         old_dc.Blit(250, 50, BITMAP_WIDTH, BITMAP_HEIGHT, temp_dc, 0, 0)
diff --git a/sphinxtools/inheritance.py b/sphinxtools/inheritance.py
index ff1ea6dc..f6bc88ae 100644
--- a/sphinxtools/inheritance.py
+++ b/sphinxtools/inheritance.py
@@ -202,7 +202,7 @@ class InheritanceDiagram(object):
 
     # ----------------------------------------------------------------------- #
 
-    def MakeInheritanceDiagram(self, class_summary):
+    def MakeInheritanceDiagram(self, class_summary=None):
         """
         Actually generates the inheritance diagram as a PNG file plus the corresponding
         MAP file for mouse navigation over the inheritance boxes.