diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index 6e8d2c09a..ac8ba333d 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -1128,7 +1128,7 @@ private:
 
     Parm *base_parm = NULL;
     if (base && !isStatic(n)) {
-      SwigType *base_type = Copy(Getattr(class_node, "classtype"));
+      SwigType *base_type = Copy(getClassType());
       SwigType_add_pointer(base_type);
       base_parm = NewParm(base_type, NewString("arg1"), n);
       set_nextSibling(base_parm, parms);
@@ -1244,7 +1244,7 @@ private:
 
     Parm *base_parm = NULL;
     if (base && !isStatic(n)) {
-      SwigType *base_type = Copy(Getattr(class_node, "classtype"));
+      SwigType *base_type = Copy(getClassType());
       SwigType_add_pointer(base_type);
       base_parm = NewParm(base_type, NewString("arg1"), n);
       set_nextSibling(base_parm, parms);
diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx
index d240d3d6f..d0cbc9195 100644
--- a/Source/Modules/lua.cxx
+++ b/Source/Modules/lua.cxx
@@ -919,7 +919,7 @@ public:
     String *wrap_class = NewStringf("&_wrap_class_%s", mangled_classname);
     SwigType_remember_clientdata(t, wrap_class);
 
-    String *rt = Copy(Getattr(n, "classtype"));
+    String *rt = Copy(getClassType());
     SwigType_add_pointer(rt);
 
     // Register the class structure with the type checker
diff --git a/Source/Modules/mzscheme.cxx b/Source/Modules/mzscheme.cxx
index 0bc3c8a68..d071dc870 100644
--- a/Source/Modules/mzscheme.cxx
+++ b/Source/Modules/mzscheme.cxx
@@ -682,7 +682,7 @@ public:
     String *mangled_classname = 0;
     String *real_classname = 0;
     String *scm_structname = NewString("");
-    SwigType *ctype_ptr = NewStringf("p.%s", Getattr(n, "classtype"));
+    SwigType *ctype_ptr = NewStringf("p.%s", getClassType());
 
     SwigType *t = NewStringf("p.%s", Getattr(n, "name"));
     swigtype_ptr = SwigType_manglestr(t);
diff --git a/Source/Modules/tcl8.cxx b/Source/Modules/tcl8.cxx
index b6b4c6965..dfdd71b64 100644
--- a/Source/Modules/tcl8.cxx
+++ b/Source/Modules/tcl8.cxx
@@ -783,10 +783,7 @@ public:
     String *wrap_class = NewStringf("&_wrap_class_%s", mangled_classname);
     SwigType_remember_clientdata(t, wrap_class);
 
-    //    t = Copy(Getattr(n,"classtype"));
-    //    SwigType_add_pointer(t);
-
-    String *rt = Copy(Getattr(n, "classtype"));
+    String *rt = Copy(getClassType());
     SwigType_add_pointer(rt);
 
     // Register the class structure with the type checker