diff --git a/dtool/metalibs/dtoolconfig/pydtool.cxx b/dtool/metalibs/dtoolconfig/pydtool.cxx
index bde03f4197..77a162c7ec 100644
--- a/dtool/metalibs/dtoolconfig/pydtool.cxx
+++ b/dtool/metalibs/dtoolconfig/pydtool.cxx
@@ -1,12 +1,13 @@
 /*
- * This file generated by:
- * interrogate -D EXPCL_DTOOLCONFIG= -nodb -python -promiscuous -I~/panda3d-git/built/include -module panda3d.dtoolconfig -library dtoolconfig -string -true-names -do-module -oc pydtool.cxx ../../src/interrogatedb/interrogate_interface.h 
+ * This file was generated by:
+ * interrogate -D EXPCL_DTOOLCONFIG= -nodb -python -promiscuous -I/home/rdb/panda3d-git/built/include -module panda3d.interrogatedb -library interrogatedb -string -true-names -do-module -oc pydtool.cxx ../../src/interrogatedb/interrogate_interface.h ../../src/interrogatedb/interrogate_request.h 
  *
  */
 
 #include <sstream>
 
 #include "../../src/interrogatedb/interrogate_interface.h"
+#include "../../src/interrogatedb/interrogate_request.h"
 #include "dtoolbase.h"
 
 #undef _POSIX_C_SOURCE
@@ -18,137 +19,139 @@
   #include "Python.h"
 #endif
 
-static PyObject *_inPU7VHtbRf(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHda_g(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH4RgX(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH3Gip(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHRKDz(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHgZ9N(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHFnRZ(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHg0Qv(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHtrqw(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHdmpW(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHUYgQ(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH0k7F(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHfIsr(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHvysR(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHYQ_2(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH3kdv(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHew01(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHQna7(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHkg95(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHluRc(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHtHdM(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHDId0(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHHuAm(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH_xr0(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHH5qp(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHU2_B(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHHFO2(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHcfjm(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH3Sjw(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHgJcX(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHYlw6(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHsmnz(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHxQ10(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH6gPB(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHISgV(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHH3bx(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHzeUk(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHUeI5(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHuSvx(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHwpYd(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHOfNh(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHf5_U(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHL3ZB(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHXw0I(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH3zru(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHRrg2(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHEJCx(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHWAZr(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHrD_M(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHjolz(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHt_JD(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHwEts(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHrJWs(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHpmFD(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHyYUX(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH54dn(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHGMpW(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHNuBV(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH9UwA(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH3FDt(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHf513(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHsqGH(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH7shV(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHA1eF(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH9tTm(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH776V(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHfaH0(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHGB9D(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHsxxs(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHMT0z(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHiW3v(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH4Px8(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHNHcs(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHqHrb(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHaOqq(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHqWOw(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHHu7x(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHwGnA(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHXGxx(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHj04Z(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHEOv4(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHpCqJ(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH_Pz3(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHt_06(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHmuPs(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHvM8B(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHap97(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH0o8D(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHOoQ2(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHKuFh(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHo5L6(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHzgKK(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH0FIF(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHZqvD(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHDyRd(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHMnKa(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHRtji(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHCnbQ(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHdUVN(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHihbt(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHbyPY(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHAaT6(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHgL9q(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHWB97(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHDUAl(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH1_Kf(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH98lD(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH9SHr(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHdiZP(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHTdER(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHYO56(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHxtCG(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH_EB2(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHEG1l(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH7tUq(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHyStU(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHdM85(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHk_GN(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH8QjG(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHyMtj(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHHDtN(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHHFjA(PyObject *self, PyObject *args);
-static PyObject *_inPU7VH_NPR(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHcTOH(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHhdU7(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHQPxU(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHO7Pz(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHvu_E(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHxGUt(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHzM1P(PyObject *self, PyObject *args);
-static PyObject *_inPU7VHoY5L(PyObject *self, PyObject *args);
+static PyObject *_inP07yttbRf(PyObject *self, PyObject *args);
+static PyObject *_inP07ytda_g(PyObject *self, PyObject *args);
+static PyObject *_inP07yt4RgX(PyObject *self, PyObject *args);
+static PyObject *_inP07yt3Gip(PyObject *self, PyObject *args);
+static PyObject *_inP07ytRKDz(PyObject *self, PyObject *args);
+static PyObject *_inP07ytgZ9N(PyObject *self, PyObject *args);
+static PyObject *_inP07ytFnRZ(PyObject *self, PyObject *args);
+static PyObject *_inP07ytg0Qv(PyObject *self, PyObject *args);
+static PyObject *_inP07yttrqw(PyObject *self, PyObject *args);
+static PyObject *_inP07ytdmpW(PyObject *self, PyObject *args);
+static PyObject *_inP07ytUYgQ(PyObject *self, PyObject *args);
+static PyObject *_inP07yt0k7F(PyObject *self, PyObject *args);
+static PyObject *_inP07ytfIsr(PyObject *self, PyObject *args);
+static PyObject *_inP07ytvysR(PyObject *self, PyObject *args);
+static PyObject *_inP07ytYQ_2(PyObject *self, PyObject *args);
+static PyObject *_inP07yt3kdv(PyObject *self, PyObject *args);
+static PyObject *_inP07ytew01(PyObject *self, PyObject *args);
+static PyObject *_inP07ytQna7(PyObject *self, PyObject *args);
+static PyObject *_inP07ytkg95(PyObject *self, PyObject *args);
+static PyObject *_inP07ytluRc(PyObject *self, PyObject *args);
+static PyObject *_inP07yttHdM(PyObject *self, PyObject *args);
+static PyObject *_inP07ytDId0(PyObject *self, PyObject *args);
+static PyObject *_inP07ytHuAm(PyObject *self, PyObject *args);
+static PyObject *_inP07yt_xr0(PyObject *self, PyObject *args);
+static PyObject *_inP07ytH5qp(PyObject *self, PyObject *args);
+static PyObject *_inP07ytU2_B(PyObject *self, PyObject *args);
+static PyObject *_inP07ytHFO2(PyObject *self, PyObject *args);
+static PyObject *_inP07ytcfjm(PyObject *self, PyObject *args);
+static PyObject *_inP07yt3Sjw(PyObject *self, PyObject *args);
+static PyObject *_inP07ytgJcX(PyObject *self, PyObject *args);
+static PyObject *_inP07ytYlw6(PyObject *self, PyObject *args);
+static PyObject *_inP07ytsmnz(PyObject *self, PyObject *args);
+static PyObject *_inP07ytxQ10(PyObject *self, PyObject *args);
+static PyObject *_inP07yt6gPB(PyObject *self, PyObject *args);
+static PyObject *_inP07ytISgV(PyObject *self, PyObject *args);
+static PyObject *_inP07ytH3bx(PyObject *self, PyObject *args);
+static PyObject *_inP07ytzeUk(PyObject *self, PyObject *args);
+static PyObject *_inP07ytUeI5(PyObject *self, PyObject *args);
+static PyObject *_inP07ytuSvx(PyObject *self, PyObject *args);
+static PyObject *_inP07ytwpYd(PyObject *self, PyObject *args);
+static PyObject *_inP07ytOfNh(PyObject *self, PyObject *args);
+static PyObject *_inP07ytf5_U(PyObject *self, PyObject *args);
+static PyObject *_inP07ytL3ZB(PyObject *self, PyObject *args);
+static PyObject *_inP07ytXw0I(PyObject *self, PyObject *args);
+static PyObject *_inP07yt3zru(PyObject *self, PyObject *args);
+static PyObject *_inP07ytRrg2(PyObject *self, PyObject *args);
+static PyObject *_inP07ytEJCx(PyObject *self, PyObject *args);
+static PyObject *_inP07ytWAZr(PyObject *self, PyObject *args);
+static PyObject *_inP07ytrD_M(PyObject *self, PyObject *args);
+static PyObject *_inP07ytjolz(PyObject *self, PyObject *args);
+static PyObject *_inP07ytt_JD(PyObject *self, PyObject *args);
+static PyObject *_inP07ytwEts(PyObject *self, PyObject *args);
+static PyObject *_inP07ytrJWs(PyObject *self, PyObject *args);
+static PyObject *_inP07ytpmFD(PyObject *self, PyObject *args);
+static PyObject *_inP07ytyYUX(PyObject *self, PyObject *args);
+static PyObject *_inP07yt54dn(PyObject *self, PyObject *args);
+static PyObject *_inP07ytGMpW(PyObject *self, PyObject *args);
+static PyObject *_inP07ytNuBV(PyObject *self, PyObject *args);
+static PyObject *_inP07yt9UwA(PyObject *self, PyObject *args);
+static PyObject *_inP07yt3FDt(PyObject *self, PyObject *args);
+static PyObject *_inP07ytf513(PyObject *self, PyObject *args);
+static PyObject *_inP07ytsqGH(PyObject *self, PyObject *args);
+static PyObject *_inP07yt7shV(PyObject *self, PyObject *args);
+static PyObject *_inP07ytA1eF(PyObject *self, PyObject *args);
+static PyObject *_inP07yt9tTm(PyObject *self, PyObject *args);
+static PyObject *_inP07yt776V(PyObject *self, PyObject *args);
+static PyObject *_inP07ytfaH0(PyObject *self, PyObject *args);
+static PyObject *_inP07ytGB9D(PyObject *self, PyObject *args);
+static PyObject *_inP07ytsxxs(PyObject *self, PyObject *args);
+static PyObject *_inP07ytMT0z(PyObject *self, PyObject *args);
+static PyObject *_inP07ytiW3v(PyObject *self, PyObject *args);
+static PyObject *_inP07yt4Px8(PyObject *self, PyObject *args);
+static PyObject *_inP07ytNHcs(PyObject *self, PyObject *args);
+static PyObject *_inP07ytqHrb(PyObject *self, PyObject *args);
+static PyObject *_inP07ytaOqq(PyObject *self, PyObject *args);
+static PyObject *_inP07ytqWOw(PyObject *self, PyObject *args);
+static PyObject *_inP07ytHu7x(PyObject *self, PyObject *args);
+static PyObject *_inP07ytwGnA(PyObject *self, PyObject *args);
+static PyObject *_inP07ytXGxx(PyObject *self, PyObject *args);
+static PyObject *_inP07ytj04Z(PyObject *self, PyObject *args);
+static PyObject *_inP07ytEOv4(PyObject *self, PyObject *args);
+static PyObject *_inP07ytpCqJ(PyObject *self, PyObject *args);
+static PyObject *_inP07yt_Pz3(PyObject *self, PyObject *args);
+static PyObject *_inP07ytt_06(PyObject *self, PyObject *args);
+static PyObject *_inP07ytmuPs(PyObject *self, PyObject *args);
+static PyObject *_inP07ytvM8B(PyObject *self, PyObject *args);
+static PyObject *_inP07ytap97(PyObject *self, PyObject *args);
+static PyObject *_inP07yt0o8D(PyObject *self, PyObject *args);
+static PyObject *_inP07ytOoQ2(PyObject *self, PyObject *args);
+static PyObject *_inP07ytKuFh(PyObject *self, PyObject *args);
+static PyObject *_inP07yto5L6(PyObject *self, PyObject *args);
+static PyObject *_inP07ytzgKK(PyObject *self, PyObject *args);
+static PyObject *_inP07yt0FIF(PyObject *self, PyObject *args);
+static PyObject *_inP07ytZqvD(PyObject *self, PyObject *args);
+static PyObject *_inP07ytDyRd(PyObject *self, PyObject *args);
+static PyObject *_inP07ytMnKa(PyObject *self, PyObject *args);
+static PyObject *_inP07ytRtji(PyObject *self, PyObject *args);
+static PyObject *_inP07ytCnbQ(PyObject *self, PyObject *args);
+static PyObject *_inP07ytdUVN(PyObject *self, PyObject *args);
+static PyObject *_inP07ytihbt(PyObject *self, PyObject *args);
+static PyObject *_inP07ytbyPY(PyObject *self, PyObject *args);
+static PyObject *_inP07ytAaT6(PyObject *self, PyObject *args);
+static PyObject *_inP07ytgL9q(PyObject *self, PyObject *args);
+static PyObject *_inP07ytWB97(PyObject *self, PyObject *args);
+static PyObject *_inP07ytDUAl(PyObject *self, PyObject *args);
+static PyObject *_inP07yt1_Kf(PyObject *self, PyObject *args);
+static PyObject *_inP07yt98lD(PyObject *self, PyObject *args);
+static PyObject *_inP07yt9SHr(PyObject *self, PyObject *args);
+static PyObject *_inP07ytdiZP(PyObject *self, PyObject *args);
+static PyObject *_inP07ytTdER(PyObject *self, PyObject *args);
+static PyObject *_inP07ytYO56(PyObject *self, PyObject *args);
+static PyObject *_inP07ytxtCG(PyObject *self, PyObject *args);
+static PyObject *_inP07yt_EB2(PyObject *self, PyObject *args);
+static PyObject *_inP07ytEG1l(PyObject *self, PyObject *args);
+static PyObject *_inP07yt7tUq(PyObject *self, PyObject *args);
+static PyObject *_inP07ytyStU(PyObject *self, PyObject *args);
+static PyObject *_inP07ytdM85(PyObject *self, PyObject *args);
+static PyObject *_inP07ytk_GN(PyObject *self, PyObject *args);
+static PyObject *_inP07yt8QjG(PyObject *self, PyObject *args);
+static PyObject *_inP07ytyMtj(PyObject *self, PyObject *args);
+static PyObject *_inP07ytHDtN(PyObject *self, PyObject *args);
+static PyObject *_inP07ytHFjA(PyObject *self, PyObject *args);
+static PyObject *_inP07yt_NPR(PyObject *self, PyObject *args);
+static PyObject *_inP07ytcTOH(PyObject *self, PyObject *args);
+static PyObject *_inP07ythdU7(PyObject *self, PyObject *args);
+static PyObject *_inP07ytQPxU(PyObject *self, PyObject *args);
+static PyObject *_inP07ytO7Pz(PyObject *self, PyObject *args);
+static PyObject *_inP07ytvu_E(PyObject *self, PyObject *args);
+static PyObject *_inP07ytxGUt(PyObject *self, PyObject *args);
+static PyObject *_inP07ytzM1P(PyObject *self, PyObject *args);
+static PyObject *_inP07ytoY5L(PyObject *self, PyObject *args);
+static PyObject *_inP07yte_7S(PyObject *self, PyObject *args);
+static PyObject *_inP07ytw_15(PyObject *self, PyObject *args);
 
 
 /*
@@ -156,10 +159,10 @@ static PyObject *_inPU7VHoY5L(PyObject *self, PyObject *args);
  * void interrogate_add_search_directory(char const *dirname)
  */
 static PyObject *
-_inPU7VHtbRf(PyObject *, PyObject *args) {
+_inP07yttbRf(PyObject *, PyObject *args) {
   char *param0;
   if (PyArg_ParseTuple(args, "s", &param0)) {
-    interrogate_add_search_directory((char *)param0);
+    interrogate_add_search_directory((char const *)param0);
     return Py_BuildValue("");
   }
   return (PyObject *)NULL;
@@ -170,10 +173,10 @@ _inPU7VHtbRf(PyObject *, PyObject *args) {
  * void interrogate_add_search_path(char const *pathstring)
  */
 static PyObject *
-_inPU7VHda_g(PyObject *, PyObject *args) {
+_inP07ytda_g(PyObject *, PyObject *args) {
   char *param0;
   if (PyArg_ParseTuple(args, "s", &param0)) {
-    interrogate_add_search_path((char *)param0);
+    interrogate_add_search_path((char const *)param0);
     return Py_BuildValue("");
   }
   return (PyObject *)NULL;
@@ -184,7 +187,7 @@ _inPU7VHda_g(PyObject *, PyObject *args) {
  * bool interrogate_error_flag(void)
  */
 static PyObject *
-_inPU7VH4RgX(PyObject *, PyObject *args) {
+_inP07yt4RgX(PyObject *, PyObject *args) {
   if (PyArg_ParseTuple(args, "")) {
     bool return_value = interrogate_error_flag();
     return PyBool_FromLong(return_value);
@@ -197,7 +200,7 @@ _inPU7VH4RgX(PyObject *, PyObject *args) {
  * int interrogate_number_of_manifests(void)
  */
 static PyObject *
-_inPU7VH3Gip(PyObject *, PyObject *args) {
+_inP07yt3Gip(PyObject *, PyObject *args) {
   if (PyArg_ParseTuple(args, "")) {
     int return_value = interrogate_number_of_manifests();
 #if PY_MAJOR_VERSION >= 3
@@ -214,7 +217,7 @@ _inPU7VH3Gip(PyObject *, PyObject *args) {
  * ManifestIndex interrogate_get_manifest(int n)
  */
 static PyObject *
-_inPU7VHRKDz(PyObject *, PyObject *args) {
+_inP07ytRKDz(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     ManifestIndex return_value = interrogate_get_manifest((int)param0);
@@ -232,10 +235,10 @@ _inPU7VHRKDz(PyObject *, PyObject *args) {
  * ManifestIndex interrogate_get_manifest_by_name(char const *manifest_name)
  */
 static PyObject *
-_inPU7VHgZ9N(PyObject *, PyObject *args) {
+_inP07ytgZ9N(PyObject *, PyObject *args) {
   char *param0;
   if (PyArg_ParseTuple(args, "s", &param0)) {
-    ManifestIndex return_value = interrogate_get_manifest_by_name((char *)param0);
+    ManifestIndex return_value = interrogate_get_manifest_by_name((char const *)param0);
 #if PY_MAJOR_VERSION >= 3
     return PyLong_FromLong(return_value);
 #else
@@ -250,7 +253,7 @@ _inPU7VHgZ9N(PyObject *, PyObject *args) {
  * char const *interrogate_manifest_name(ManifestIndex manifest)
  */
 static PyObject *
-_inPU7VHFnRZ(PyObject *, PyObject *args) {
+_inP07ytFnRZ(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_manifest_name((ManifestIndex)param0);
@@ -268,7 +271,7 @@ _inPU7VHFnRZ(PyObject *, PyObject *args) {
  * char const *interrogate_manifest_definition(ManifestIndex manifest)
  */
 static PyObject *
-_inPU7VHg0Qv(PyObject *, PyObject *args) {
+_inP07ytg0Qv(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_manifest_definition((ManifestIndex)param0);
@@ -286,7 +289,7 @@ _inPU7VHg0Qv(PyObject *, PyObject *args) {
  * bool interrogate_manifest_has_type(ManifestIndex manifest)
  */
 static PyObject *
-_inPU7VHtrqw(PyObject *, PyObject *args) {
+_inP07yttrqw(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_manifest_has_type((ManifestIndex)param0);
@@ -300,7 +303,7 @@ _inPU7VHtrqw(PyObject *, PyObject *args) {
  * TypeIndex interrogate_manifest_get_type(ManifestIndex manifest)
  */
 static PyObject *
-_inPU7VHdmpW(PyObject *, PyObject *args) {
+_inP07ytdmpW(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     TypeIndex return_value = interrogate_manifest_get_type((ManifestIndex)param0);
@@ -318,7 +321,7 @@ _inPU7VHdmpW(PyObject *, PyObject *args) {
  * bool interrogate_manifest_has_getter(ManifestIndex manifest)
  */
 static PyObject *
-_inPU7VHUYgQ(PyObject *, PyObject *args) {
+_inP07ytUYgQ(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_manifest_has_getter((ManifestIndex)param0);
@@ -332,7 +335,7 @@ _inPU7VHUYgQ(PyObject *, PyObject *args) {
  * FunctionIndex interrogate_manifest_getter(ManifestIndex manifest)
  */
 static PyObject *
-_inPU7VH0k7F(PyObject *, PyObject *args) {
+_inP07yt0k7F(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     FunctionIndex return_value = interrogate_manifest_getter((ManifestIndex)param0);
@@ -350,7 +353,7 @@ _inPU7VH0k7F(PyObject *, PyObject *args) {
  * bool interrogate_manifest_has_int_value(ManifestIndex manifest)
  */
 static PyObject *
-_inPU7VHfIsr(PyObject *, PyObject *args) {
+_inP07ytfIsr(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_manifest_has_int_value((ManifestIndex)param0);
@@ -364,7 +367,7 @@ _inPU7VHfIsr(PyObject *, PyObject *args) {
  * int interrogate_manifest_get_int_value(ManifestIndex manifest)
  */
 static PyObject *
-_inPU7VHvysR(PyObject *, PyObject *args) {
+_inP07ytvysR(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     int return_value = interrogate_manifest_get_int_value((ManifestIndex)param0);
@@ -382,7 +385,7 @@ _inPU7VHvysR(PyObject *, PyObject *args) {
  * char const *interrogate_element_name(ElementIndex element)
  */
 static PyObject *
-_inPU7VHYQ_2(PyObject *, PyObject *args) {
+_inP07ytYQ_2(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_element_name((ElementIndex)param0);
@@ -400,7 +403,7 @@ _inPU7VHYQ_2(PyObject *, PyObject *args) {
  * char const *interrogate_element_scoped_name(ElementIndex element)
  */
 static PyObject *
-_inPU7VH3kdv(PyObject *, PyObject *args) {
+_inP07yt3kdv(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_element_scoped_name((ElementIndex)param0);
@@ -418,7 +421,7 @@ _inPU7VH3kdv(PyObject *, PyObject *args) {
  * bool interrogate_element_has_comment(ElementIndex element)
  */
 static PyObject *
-_inPU7VHew01(PyObject *, PyObject *args) {
+_inP07ytew01(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_element_has_comment((ElementIndex)param0);
@@ -432,7 +435,7 @@ _inPU7VHew01(PyObject *, PyObject *args) {
  * char const *interrogate_element_comment(ElementIndex element)
  */
 static PyObject *
-_inPU7VHQna7(PyObject *, PyObject *args) {
+_inP07ytQna7(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_element_comment((ElementIndex)param0);
@@ -450,10 +453,10 @@ _inPU7VHQna7(PyObject *, PyObject *args) {
  * ElementIndex interrogate_get_element_by_name(char const *element_name)
  */
 static PyObject *
-_inPU7VHkg95(PyObject *, PyObject *args) {
+_inP07ytkg95(PyObject *, PyObject *args) {
   char *param0;
   if (PyArg_ParseTuple(args, "s", &param0)) {
-    ElementIndex return_value = interrogate_get_element_by_name((char *)param0);
+    ElementIndex return_value = interrogate_get_element_by_name((char const *)param0);
 #if PY_MAJOR_VERSION >= 3
     return PyLong_FromLong(return_value);
 #else
@@ -468,10 +471,10 @@ _inPU7VHkg95(PyObject *, PyObject *args) {
  * ElementIndex interrogate_get_element_by_scoped_name(char const *element_name)
  */
 static PyObject *
-_inPU7VHluRc(PyObject *, PyObject *args) {
+_inP07ytluRc(PyObject *, PyObject *args) {
   char *param0;
   if (PyArg_ParseTuple(args, "s", &param0)) {
-    ElementIndex return_value = interrogate_get_element_by_scoped_name((char *)param0);
+    ElementIndex return_value = interrogate_get_element_by_scoped_name((char const *)param0);
 #if PY_MAJOR_VERSION >= 3
     return PyLong_FromLong(return_value);
 #else
@@ -486,7 +489,7 @@ _inPU7VHluRc(PyObject *, PyObject *args) {
  * TypeIndex interrogate_element_type(ElementIndex element)
  */
 static PyObject *
-_inPU7VHtHdM(PyObject *, PyObject *args) {
+_inP07yttHdM(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     TypeIndex return_value = interrogate_element_type((ElementIndex)param0);
@@ -504,7 +507,7 @@ _inPU7VHtHdM(PyObject *, PyObject *args) {
  * bool interrogate_element_has_getter(ElementIndex element)
  */
 static PyObject *
-_inPU7VHDId0(PyObject *, PyObject *args) {
+_inP07ytDId0(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_element_has_getter((ElementIndex)param0);
@@ -518,7 +521,7 @@ _inPU7VHDId0(PyObject *, PyObject *args) {
  * FunctionIndex interrogate_element_getter(ElementIndex element)
  */
 static PyObject *
-_inPU7VHHuAm(PyObject *, PyObject *args) {
+_inP07ytHuAm(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     FunctionIndex return_value = interrogate_element_getter((ElementIndex)param0);
@@ -536,7 +539,7 @@ _inPU7VHHuAm(PyObject *, PyObject *args) {
  * bool interrogate_element_has_setter(ElementIndex element)
  */
 static PyObject *
-_inPU7VH_xr0(PyObject *, PyObject *args) {
+_inP07yt_xr0(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_element_has_setter((ElementIndex)param0);
@@ -550,7 +553,7 @@ _inPU7VH_xr0(PyObject *, PyObject *args) {
  * FunctionIndex interrogate_element_setter(ElementIndex element)
  */
 static PyObject *
-_inPU7VHH5qp(PyObject *, PyObject *args) {
+_inP07ytH5qp(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     FunctionIndex return_value = interrogate_element_setter((ElementIndex)param0);
@@ -568,7 +571,7 @@ _inPU7VHH5qp(PyObject *, PyObject *args) {
  * int interrogate_number_of_globals(void)
  */
 static PyObject *
-_inPU7VHU2_B(PyObject *, PyObject *args) {
+_inP07ytU2_B(PyObject *, PyObject *args) {
   if (PyArg_ParseTuple(args, "")) {
     int return_value = interrogate_number_of_globals();
 #if PY_MAJOR_VERSION >= 3
@@ -585,7 +588,7 @@ _inPU7VHU2_B(PyObject *, PyObject *args) {
  * ElementIndex interrogate_get_global(int n)
  */
 static PyObject *
-_inPU7VHHFO2(PyObject *, PyObject *args) {
+_inP07ytHFO2(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     ElementIndex return_value = interrogate_get_global((int)param0);
@@ -603,7 +606,7 @@ _inPU7VHHFO2(PyObject *, PyObject *args) {
  * int interrogate_number_of_global_functions(void)
  */
 static PyObject *
-_inPU7VHcfjm(PyObject *, PyObject *args) {
+_inP07ytcfjm(PyObject *, PyObject *args) {
   if (PyArg_ParseTuple(args, "")) {
     int return_value = interrogate_number_of_global_functions();
 #if PY_MAJOR_VERSION >= 3
@@ -620,7 +623,7 @@ _inPU7VHcfjm(PyObject *, PyObject *args) {
  * FunctionIndex interrogate_get_global_function(int n)
  */
 static PyObject *
-_inPU7VH3Sjw(PyObject *, PyObject *args) {
+_inP07yt3Sjw(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     FunctionIndex return_value = interrogate_get_global_function((int)param0);
@@ -638,7 +641,7 @@ _inPU7VH3Sjw(PyObject *, PyObject *args) {
  * int interrogate_number_of_functions(void)
  */
 static PyObject *
-_inPU7VHgJcX(PyObject *, PyObject *args) {
+_inP07ytgJcX(PyObject *, PyObject *args) {
   if (PyArg_ParseTuple(args, "")) {
     int return_value = interrogate_number_of_functions();
 #if PY_MAJOR_VERSION >= 3
@@ -655,7 +658,7 @@ _inPU7VHgJcX(PyObject *, PyObject *args) {
  * FunctionIndex interrogate_get_function(int n)
  */
 static PyObject *
-_inPU7VHYlw6(PyObject *, PyObject *args) {
+_inP07ytYlw6(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     FunctionIndex return_value = interrogate_get_function((int)param0);
@@ -673,7 +676,7 @@ _inPU7VHYlw6(PyObject *, PyObject *args) {
  * char const *interrogate_function_name(FunctionIndex function)
  */
 static PyObject *
-_inPU7VHsmnz(PyObject *, PyObject *args) {
+_inP07ytsmnz(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_function_name((FunctionIndex)param0);
@@ -691,7 +694,7 @@ _inPU7VHsmnz(PyObject *, PyObject *args) {
  * char const *interrogate_function_scoped_name(FunctionIndex function)
  */
 static PyObject *
-_inPU7VHxQ10(PyObject *, PyObject *args) {
+_inP07ytxQ10(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_function_scoped_name((FunctionIndex)param0);
@@ -709,7 +712,7 @@ _inPU7VHxQ10(PyObject *, PyObject *args) {
  * bool interrogate_function_has_comment(FunctionIndex function)
  */
 static PyObject *
-_inPU7VH6gPB(PyObject *, PyObject *args) {
+_inP07yt6gPB(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_function_has_comment((FunctionIndex)param0);
@@ -723,7 +726,7 @@ _inPU7VH6gPB(PyObject *, PyObject *args) {
  * char const *interrogate_function_comment(FunctionIndex function)
  */
 static PyObject *
-_inPU7VHISgV(PyObject *, PyObject *args) {
+_inP07ytISgV(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_function_comment((FunctionIndex)param0);
@@ -741,7 +744,7 @@ _inPU7VHISgV(PyObject *, PyObject *args) {
  * char const *interrogate_function_prototype(FunctionIndex function)
  */
 static PyObject *
-_inPU7VHH3bx(PyObject *, PyObject *args) {
+_inP07ytH3bx(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_function_prototype((FunctionIndex)param0);
@@ -759,7 +762,7 @@ _inPU7VHH3bx(PyObject *, PyObject *args) {
  * bool interrogate_function_is_method(FunctionIndex function)
  */
 static PyObject *
-_inPU7VHzeUk(PyObject *, PyObject *args) {
+_inP07ytzeUk(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_function_is_method((FunctionIndex)param0);
@@ -773,7 +776,7 @@ _inPU7VHzeUk(PyObject *, PyObject *args) {
  * TypeIndex interrogate_function_class(FunctionIndex function)
  */
 static PyObject *
-_inPU7VHUeI5(PyObject *, PyObject *args) {
+_inP07ytUeI5(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     TypeIndex return_value = interrogate_function_class((FunctionIndex)param0);
@@ -791,7 +794,7 @@ _inPU7VHUeI5(PyObject *, PyObject *args) {
  * bool interrogate_function_has_module_name(FunctionIndex function)
  */
 static PyObject *
-_inPU7VHuSvx(PyObject *, PyObject *args) {
+_inP07ytuSvx(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_function_has_module_name((FunctionIndex)param0);
@@ -805,7 +808,7 @@ _inPU7VHuSvx(PyObject *, PyObject *args) {
  * char const *interrogate_function_module_name(FunctionIndex function)
  */
 static PyObject *
-_inPU7VHwpYd(PyObject *, PyObject *args) {
+_inP07ytwpYd(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_function_module_name((FunctionIndex)param0);
@@ -823,7 +826,7 @@ _inPU7VHwpYd(PyObject *, PyObject *args) {
  * bool interrogate_function_has_library_name(FunctionIndex function)
  */
 static PyObject *
-_inPU7VHOfNh(PyObject *, PyObject *args) {
+_inP07ytOfNh(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_function_has_library_name((FunctionIndex)param0);
@@ -837,7 +840,7 @@ _inPU7VHOfNh(PyObject *, PyObject *args) {
  * char const *interrogate_function_library_name(FunctionIndex function)
  */
 static PyObject *
-_inPU7VHf5_U(PyObject *, PyObject *args) {
+_inP07ytf5_U(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_function_library_name((FunctionIndex)param0);
@@ -855,7 +858,7 @@ _inPU7VHf5_U(PyObject *, PyObject *args) {
  * bool interrogate_function_is_virtual(FunctionIndex function)
  */
 static PyObject *
-_inPU7VHL3ZB(PyObject *, PyObject *args) {
+_inP07ytL3ZB(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_function_is_virtual((FunctionIndex)param0);
@@ -869,7 +872,7 @@ _inPU7VHL3ZB(PyObject *, PyObject *args) {
  * int interrogate_function_number_of_c_wrappers(FunctionIndex function)
  */
 static PyObject *
-_inPU7VHXw0I(PyObject *, PyObject *args) {
+_inP07ytXw0I(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     int return_value = interrogate_function_number_of_c_wrappers((FunctionIndex)param0);
@@ -887,7 +890,7 @@ _inPU7VHXw0I(PyObject *, PyObject *args) {
  * FunctionWrapperIndex interrogate_function_c_wrapper(FunctionIndex function, int n)
  */
 static PyObject *
-_inPU7VH3zru(PyObject *, PyObject *args) {
+_inP07yt3zru(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -906,7 +909,7 @@ _inPU7VH3zru(PyObject *, PyObject *args) {
  * int interrogate_function_number_of_python_wrappers(FunctionIndex function)
  */
 static PyObject *
-_inPU7VHRrg2(PyObject *, PyObject *args) {
+_inP07ytRrg2(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     int return_value = interrogate_function_number_of_python_wrappers((FunctionIndex)param0);
@@ -924,7 +927,7 @@ _inPU7VHRrg2(PyObject *, PyObject *args) {
  * FunctionWrapperIndex interrogate_function_python_wrapper(FunctionIndex function, int n)
  */
 static PyObject *
-_inPU7VHEJCx(PyObject *, PyObject *args) {
+_inP07ytEJCx(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -943,7 +946,7 @@ _inPU7VHEJCx(PyObject *, PyObject *args) {
  * char const *interrogate_wrapper_name(FunctionWrapperIndex wrapper)
  */
 static PyObject *
-_inPU7VHWAZr(PyObject *, PyObject *args) {
+_inP07ytWAZr(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_wrapper_name((FunctionWrapperIndex)param0);
@@ -961,7 +964,7 @@ _inPU7VHWAZr(PyObject *, PyObject *args) {
  * bool interrogate_wrapper_is_callable_by_name(FunctionWrapperIndex wrapper)
  */
 static PyObject *
-_inPU7VHrD_M(PyObject *, PyObject *args) {
+_inP07ytrD_M(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_wrapper_is_callable_by_name((FunctionWrapperIndex)param0);
@@ -975,7 +978,7 @@ _inPU7VHrD_M(PyObject *, PyObject *args) {
  * bool interrogate_wrapper_has_comment(FunctionWrapperIndex wrapper)
  */
 static PyObject *
-_inPU7VHjolz(PyObject *, PyObject *args) {
+_inP07ytjolz(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_wrapper_has_comment((FunctionWrapperIndex)param0);
@@ -989,7 +992,7 @@ _inPU7VHjolz(PyObject *, PyObject *args) {
  * char const *interrogate_wrapper_comment(FunctionWrapperIndex wrapper)
  */
 static PyObject *
-_inPU7VHt_JD(PyObject *, PyObject *args) {
+_inP07ytt_JD(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_wrapper_comment((FunctionWrapperIndex)param0);
@@ -1007,7 +1010,7 @@ _inPU7VHt_JD(PyObject *, PyObject *args) {
  * bool interrogate_wrapper_has_return_value(FunctionWrapperIndex wrapper)
  */
 static PyObject *
-_inPU7VHwEts(PyObject *, PyObject *args) {
+_inP07ytwEts(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_wrapper_has_return_value((FunctionWrapperIndex)param0);
@@ -1021,7 +1024,7 @@ _inPU7VHwEts(PyObject *, PyObject *args) {
  * TypeIndex interrogate_wrapper_return_type(FunctionWrapperIndex wrapper)
  */
 static PyObject *
-_inPU7VHrJWs(PyObject *, PyObject *args) {
+_inP07ytrJWs(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     TypeIndex return_value = interrogate_wrapper_return_type((FunctionWrapperIndex)param0);
@@ -1039,7 +1042,7 @@ _inPU7VHrJWs(PyObject *, PyObject *args) {
  * bool interrogate_wrapper_caller_manages_return_value(FunctionWrapperIndex wrapper)
  */
 static PyObject *
-_inPU7VHpmFD(PyObject *, PyObject *args) {
+_inP07ytpmFD(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_wrapper_caller_manages_return_value((FunctionWrapperIndex)param0);
@@ -1053,7 +1056,7 @@ _inPU7VHpmFD(PyObject *, PyObject *args) {
  * FunctionIndex interrogate_wrapper_return_value_destructor(FunctionWrapperIndex wrapper)
  */
 static PyObject *
-_inPU7VHyYUX(PyObject *, PyObject *args) {
+_inP07ytyYUX(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     FunctionIndex return_value = interrogate_wrapper_return_value_destructor((FunctionWrapperIndex)param0);
@@ -1071,7 +1074,7 @@ _inPU7VHyYUX(PyObject *, PyObject *args) {
  * int interrogate_wrapper_number_of_parameters(FunctionWrapperIndex wrapper)
  */
 static PyObject *
-_inPU7VH54dn(PyObject *, PyObject *args) {
+_inP07yt54dn(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     int return_value = interrogate_wrapper_number_of_parameters((FunctionWrapperIndex)param0);
@@ -1089,7 +1092,7 @@ _inPU7VH54dn(PyObject *, PyObject *args) {
  * TypeIndex interrogate_wrapper_parameter_type(FunctionWrapperIndex wrapper, int n)
  */
 static PyObject *
-_inPU7VHGMpW(PyObject *, PyObject *args) {
+_inP07ytGMpW(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -1108,7 +1111,7 @@ _inPU7VHGMpW(PyObject *, PyObject *args) {
  * bool interrogate_wrapper_parameter_has_name(FunctionWrapperIndex wrapper, int n)
  */
 static PyObject *
-_inPU7VHNuBV(PyObject *, PyObject *args) {
+_inP07ytNuBV(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -1123,7 +1126,7 @@ _inPU7VHNuBV(PyObject *, PyObject *args) {
  * char const *interrogate_wrapper_parameter_name(FunctionWrapperIndex wrapper, int n)
  */
 static PyObject *
-_inPU7VH9UwA(PyObject *, PyObject *args) {
+_inP07yt9UwA(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -1142,7 +1145,7 @@ _inPU7VH9UwA(PyObject *, PyObject *args) {
  * bool interrogate_wrapper_parameter_is_this(FunctionWrapperIndex wrapper, int n)
  */
 static PyObject *
-_inPU7VH3FDt(PyObject *, PyObject *args) {
+_inP07yt3FDt(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -1157,7 +1160,7 @@ _inPU7VH3FDt(PyObject *, PyObject *args) {
  * bool interrogate_wrapper_has_pointer(FunctionWrapperIndex wrapper)
  */
 static PyObject *
-_inPU7VHf513(PyObject *, PyObject *args) {
+_inP07ytf513(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_wrapper_has_pointer((FunctionWrapperIndex)param0);
@@ -1171,7 +1174,7 @@ _inPU7VHf513(PyObject *, PyObject *args) {
  * void *interrogate_wrapper_pointer(FunctionWrapperIndex wrapper)
  */
 static PyObject *
-_inPU7VHsqGH(PyObject *, PyObject *args) {
+_inP07ytsqGH(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     interrogate_wrapper_pointer((FunctionWrapperIndex)param0);
@@ -1185,7 +1188,7 @@ _inPU7VHsqGH(PyObject *, PyObject *args) {
  * char const *interrogate_wrapper_unique_name(FunctionWrapperIndex wrapper)
  */
 static PyObject *
-_inPU7VH7shV(PyObject *, PyObject *args) {
+_inP07yt7shV(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_wrapper_unique_name((FunctionWrapperIndex)param0);
@@ -1203,10 +1206,10 @@ _inPU7VH7shV(PyObject *, PyObject *args) {
  * FunctionWrapperIndex interrogate_get_wrapper_by_unique_name(char const *unique_name)
  */
 static PyObject *
-_inPU7VHA1eF(PyObject *, PyObject *args) {
+_inP07ytA1eF(PyObject *, PyObject *args) {
   char *param0;
   if (PyArg_ParseTuple(args, "s", &param0)) {
-    FunctionWrapperIndex return_value = interrogate_get_wrapper_by_unique_name((char *)param0);
+    FunctionWrapperIndex return_value = interrogate_get_wrapper_by_unique_name((char const *)param0);
 #if PY_MAJOR_VERSION >= 3
     return PyLong_FromLong(return_value);
 #else
@@ -1221,7 +1224,7 @@ _inPU7VHA1eF(PyObject *, PyObject *args) {
  * TypeIndex interrogate_make_seq_class(MakeSeqIndex make_seq)
  */
 static PyObject *
-_inPU7VH9tTm(PyObject *, PyObject *args) {
+_inP07yt9tTm(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     TypeIndex return_value = interrogate_make_seq_class((MakeSeqIndex)param0);
@@ -1239,7 +1242,7 @@ _inPU7VH9tTm(PyObject *, PyObject *args) {
  * char const *interrogate_make_seq_seq_name(MakeSeqIndex make_seq)
  */
 static PyObject *
-_inPU7VH776V(PyObject *, PyObject *args) {
+_inP07yt776V(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_make_seq_seq_name((MakeSeqIndex)param0);
@@ -1257,7 +1260,7 @@ _inPU7VH776V(PyObject *, PyObject *args) {
  * char const *interrogate_make_seq_num_name(MakeSeqIndex make_seq)
  */
 static PyObject *
-_inPU7VHfaH0(PyObject *, PyObject *args) {
+_inP07ytfaH0(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_make_seq_num_name((MakeSeqIndex)param0);
@@ -1275,7 +1278,7 @@ _inPU7VHfaH0(PyObject *, PyObject *args) {
  * char const *interrogate_make_seq_element_name(MakeSeqIndex make_seq)
  */
 static PyObject *
-_inPU7VHGB9D(PyObject *, PyObject *args) {
+_inP07ytGB9D(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_make_seq_element_name((MakeSeqIndex)param0);
@@ -1293,7 +1296,7 @@ _inPU7VHGB9D(PyObject *, PyObject *args) {
  * int interrogate_number_of_global_types(void)
  */
 static PyObject *
-_inPU7VHsxxs(PyObject *, PyObject *args) {
+_inP07ytsxxs(PyObject *, PyObject *args) {
   if (PyArg_ParseTuple(args, "")) {
     int return_value = interrogate_number_of_global_types();
 #if PY_MAJOR_VERSION >= 3
@@ -1310,7 +1313,7 @@ _inPU7VHsxxs(PyObject *, PyObject *args) {
  * TypeIndex interrogate_get_global_type(int n)
  */
 static PyObject *
-_inPU7VHMT0z(PyObject *, PyObject *args) {
+_inP07ytMT0z(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     TypeIndex return_value = interrogate_get_global_type((int)param0);
@@ -1328,7 +1331,7 @@ _inPU7VHMT0z(PyObject *, PyObject *args) {
  * int interrogate_number_of_types(void)
  */
 static PyObject *
-_inPU7VHiW3v(PyObject *, PyObject *args) {
+_inP07ytiW3v(PyObject *, PyObject *args) {
   if (PyArg_ParseTuple(args, "")) {
     int return_value = interrogate_number_of_types();
 #if PY_MAJOR_VERSION >= 3
@@ -1345,7 +1348,7 @@ _inPU7VHiW3v(PyObject *, PyObject *args) {
  * TypeIndex interrogate_get_type(int n)
  */
 static PyObject *
-_inPU7VH4Px8(PyObject *, PyObject *args) {
+_inP07yt4Px8(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     TypeIndex return_value = interrogate_get_type((int)param0);
@@ -1363,10 +1366,10 @@ _inPU7VH4Px8(PyObject *, PyObject *args) {
  * TypeIndex interrogate_get_type_by_name(char const *type_name)
  */
 static PyObject *
-_inPU7VHNHcs(PyObject *, PyObject *args) {
+_inP07ytNHcs(PyObject *, PyObject *args) {
   char *param0;
   if (PyArg_ParseTuple(args, "s", &param0)) {
-    TypeIndex return_value = interrogate_get_type_by_name((char *)param0);
+    TypeIndex return_value = interrogate_get_type_by_name((char const *)param0);
 #if PY_MAJOR_VERSION >= 3
     return PyLong_FromLong(return_value);
 #else
@@ -1381,10 +1384,10 @@ _inPU7VHNHcs(PyObject *, PyObject *args) {
  * TypeIndex interrogate_get_type_by_scoped_name(char const *type_name)
  */
 static PyObject *
-_inPU7VHqHrb(PyObject *, PyObject *args) {
+_inP07ytqHrb(PyObject *, PyObject *args) {
   char *param0;
   if (PyArg_ParseTuple(args, "s", &param0)) {
-    TypeIndex return_value = interrogate_get_type_by_scoped_name((char *)param0);
+    TypeIndex return_value = interrogate_get_type_by_scoped_name((char const *)param0);
 #if PY_MAJOR_VERSION >= 3
     return PyLong_FromLong(return_value);
 #else
@@ -1399,10 +1402,10 @@ _inPU7VHqHrb(PyObject *, PyObject *args) {
  * TypeIndex interrogate_get_type_by_true_name(char const *type_name)
  */
 static PyObject *
-_inPU7VHaOqq(PyObject *, PyObject *args) {
+_inP07ytaOqq(PyObject *, PyObject *args) {
   char *param0;
   if (PyArg_ParseTuple(args, "s", &param0)) {
-    TypeIndex return_value = interrogate_get_type_by_true_name((char *)param0);
+    TypeIndex return_value = interrogate_get_type_by_true_name((char const *)param0);
 #if PY_MAJOR_VERSION >= 3
     return PyLong_FromLong(return_value);
 #else
@@ -1417,7 +1420,7 @@ _inPU7VHaOqq(PyObject *, PyObject *args) {
  * char const *interrogate_type_name(TypeIndex type)
  */
 static PyObject *
-_inPU7VHqWOw(PyObject *, PyObject *args) {
+_inP07ytqWOw(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_type_name((TypeIndex)param0);
@@ -1435,7 +1438,7 @@ _inPU7VHqWOw(PyObject *, PyObject *args) {
  * char const *interrogate_type_scoped_name(TypeIndex type)
  */
 static PyObject *
-_inPU7VHHu7x(PyObject *, PyObject *args) {
+_inP07ytHu7x(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_type_scoped_name((TypeIndex)param0);
@@ -1453,7 +1456,7 @@ _inPU7VHHu7x(PyObject *, PyObject *args) {
  * char const *interrogate_type_true_name(TypeIndex type)
  */
 static PyObject *
-_inPU7VHwGnA(PyObject *, PyObject *args) {
+_inP07ytwGnA(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_type_true_name((TypeIndex)param0);
@@ -1471,7 +1474,7 @@ _inPU7VHwGnA(PyObject *, PyObject *args) {
  * bool interrogate_type_is_nested(TypeIndex type)
  */
 static PyObject *
-_inPU7VHXGxx(PyObject *, PyObject *args) {
+_inP07ytXGxx(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_nested((TypeIndex)param0);
@@ -1485,7 +1488,7 @@ _inPU7VHXGxx(PyObject *, PyObject *args) {
  * TypeIndex interrogate_type_outer_class(TypeIndex type)
  */
 static PyObject *
-_inPU7VHj04Z(PyObject *, PyObject *args) {
+_inP07ytj04Z(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     TypeIndex return_value = interrogate_type_outer_class((TypeIndex)param0);
@@ -1503,7 +1506,7 @@ _inPU7VHj04Z(PyObject *, PyObject *args) {
  * bool interrogate_type_has_comment(TypeIndex type)
  */
 static PyObject *
-_inPU7VHEOv4(PyObject *, PyObject *args) {
+_inP07ytEOv4(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_has_comment((TypeIndex)param0);
@@ -1517,7 +1520,7 @@ _inPU7VHEOv4(PyObject *, PyObject *args) {
  * char const *interrogate_type_comment(TypeIndex type)
  */
 static PyObject *
-_inPU7VHpCqJ(PyObject *, PyObject *args) {
+_inP07ytpCqJ(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_type_comment((TypeIndex)param0);
@@ -1535,7 +1538,7 @@ _inPU7VHpCqJ(PyObject *, PyObject *args) {
  * bool interrogate_type_has_module_name(TypeIndex type)
  */
 static PyObject *
-_inPU7VH_Pz3(PyObject *, PyObject *args) {
+_inP07yt_Pz3(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_has_module_name((TypeIndex)param0);
@@ -1549,7 +1552,7 @@ _inPU7VH_Pz3(PyObject *, PyObject *args) {
  * char const *interrogate_type_module_name(TypeIndex type)
  */
 static PyObject *
-_inPU7VHt_06(PyObject *, PyObject *args) {
+_inP07ytt_06(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_type_module_name((TypeIndex)param0);
@@ -1567,7 +1570,7 @@ _inPU7VHt_06(PyObject *, PyObject *args) {
  * bool interrogate_type_has_library_name(TypeIndex type)
  */
 static PyObject *
-_inPU7VHmuPs(PyObject *, PyObject *args) {
+_inP07ytmuPs(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_has_library_name((TypeIndex)param0);
@@ -1581,7 +1584,7 @@ _inPU7VHmuPs(PyObject *, PyObject *args) {
  * char const *interrogate_type_library_name(TypeIndex type)
  */
 static PyObject *
-_inPU7VHvM8B(PyObject *, PyObject *args) {
+_inP07ytvM8B(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     char const *return_value = interrogate_type_library_name((TypeIndex)param0);
@@ -1599,7 +1602,7 @@ _inPU7VHvM8B(PyObject *, PyObject *args) {
  * bool interrogate_type_is_atomic(TypeIndex type)
  */
 static PyObject *
-_inPU7VHap97(PyObject *, PyObject *args) {
+_inP07ytap97(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_atomic((TypeIndex)param0);
@@ -1613,7 +1616,7 @@ _inPU7VHap97(PyObject *, PyObject *args) {
  * AtomicToken interrogate_type_atomic_token(TypeIndex type)
  */
 static PyObject *
-_inPU7VH0o8D(PyObject *, PyObject *args) {
+_inP07yt0o8D(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     AtomicToken return_value = interrogate_type_atomic_token((TypeIndex)param0);
@@ -1631,7 +1634,7 @@ _inPU7VH0o8D(PyObject *, PyObject *args) {
  * bool interrogate_type_is_unsigned(TypeIndex type)
  */
 static PyObject *
-_inPU7VHOoQ2(PyObject *, PyObject *args) {
+_inP07ytOoQ2(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_unsigned((TypeIndex)param0);
@@ -1645,7 +1648,7 @@ _inPU7VHOoQ2(PyObject *, PyObject *args) {
  * bool interrogate_type_is_signed(TypeIndex type)
  */
 static PyObject *
-_inPU7VHKuFh(PyObject *, PyObject *args) {
+_inP07ytKuFh(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_signed((TypeIndex)param0);
@@ -1659,7 +1662,7 @@ _inPU7VHKuFh(PyObject *, PyObject *args) {
  * bool interrogate_type_is_long(TypeIndex type)
  */
 static PyObject *
-_inPU7VHo5L6(PyObject *, PyObject *args) {
+_inP07yto5L6(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_long((TypeIndex)param0);
@@ -1673,7 +1676,7 @@ _inPU7VHo5L6(PyObject *, PyObject *args) {
  * bool interrogate_type_is_longlong(TypeIndex type)
  */
 static PyObject *
-_inPU7VHzgKK(PyObject *, PyObject *args) {
+_inP07ytzgKK(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_longlong((TypeIndex)param0);
@@ -1687,7 +1690,7 @@ _inPU7VHzgKK(PyObject *, PyObject *args) {
  * bool interrogate_type_is_short(TypeIndex type)
  */
 static PyObject *
-_inPU7VH0FIF(PyObject *, PyObject *args) {
+_inP07yt0FIF(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_short((TypeIndex)param0);
@@ -1701,7 +1704,7 @@ _inPU7VH0FIF(PyObject *, PyObject *args) {
  * bool interrogate_type_is_wrapped(TypeIndex type)
  */
 static PyObject *
-_inPU7VHZqvD(PyObject *, PyObject *args) {
+_inP07ytZqvD(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_wrapped((TypeIndex)param0);
@@ -1715,7 +1718,7 @@ _inPU7VHZqvD(PyObject *, PyObject *args) {
  * bool interrogate_type_is_pointer(TypeIndex type)
  */
 static PyObject *
-_inPU7VHDyRd(PyObject *, PyObject *args) {
+_inP07ytDyRd(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_pointer((TypeIndex)param0);
@@ -1729,7 +1732,7 @@ _inPU7VHDyRd(PyObject *, PyObject *args) {
  * bool interrogate_type_is_const(TypeIndex type)
  */
 static PyObject *
-_inPU7VHMnKa(PyObject *, PyObject *args) {
+_inP07ytMnKa(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_const((TypeIndex)param0);
@@ -1743,7 +1746,7 @@ _inPU7VHMnKa(PyObject *, PyObject *args) {
  * bool interrogate_type_is_typedef(TypeIndex type)
  */
 static PyObject *
-_inPU7VHRtji(PyObject *, PyObject *args) {
+_inP07ytRtji(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_typedef((TypeIndex)param0);
@@ -1757,7 +1760,7 @@ _inPU7VHRtji(PyObject *, PyObject *args) {
  * TypeIndex interrogate_type_wrapped_type(TypeIndex type)
  */
 static PyObject *
-_inPU7VHCnbQ(PyObject *, PyObject *args) {
+_inP07ytCnbQ(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     TypeIndex return_value = interrogate_type_wrapped_type((TypeIndex)param0);
@@ -1775,7 +1778,7 @@ _inPU7VHCnbQ(PyObject *, PyObject *args) {
  * bool interrogate_type_is_enum(TypeIndex type)
  */
 static PyObject *
-_inPU7VHdUVN(PyObject *, PyObject *args) {
+_inP07ytdUVN(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_enum((TypeIndex)param0);
@@ -1789,7 +1792,7 @@ _inPU7VHdUVN(PyObject *, PyObject *args) {
  * int interrogate_type_number_of_enum_values(TypeIndex type)
  */
 static PyObject *
-_inPU7VHihbt(PyObject *, PyObject *args) {
+_inP07ytihbt(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     int return_value = interrogate_type_number_of_enum_values((TypeIndex)param0);
@@ -1807,7 +1810,7 @@ _inPU7VHihbt(PyObject *, PyObject *args) {
  * char const *interrogate_type_enum_value_name(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHbyPY(PyObject *, PyObject *args) {
+_inP07ytbyPY(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -1826,7 +1829,7 @@ _inPU7VHbyPY(PyObject *, PyObject *args) {
  * char const *interrogate_type_enum_value_scoped_name(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHAaT6(PyObject *, PyObject *args) {
+_inP07ytAaT6(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -1845,7 +1848,7 @@ _inPU7VHAaT6(PyObject *, PyObject *args) {
  * char const *interrogate_type_enum_value_comment(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHgL9q(PyObject *, PyObject *args) {
+_inP07ytgL9q(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -1864,7 +1867,7 @@ _inPU7VHgL9q(PyObject *, PyObject *args) {
  * int interrogate_type_enum_value(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHWB97(PyObject *, PyObject *args) {
+_inP07ytWB97(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -1883,7 +1886,7 @@ _inPU7VHWB97(PyObject *, PyObject *args) {
  * bool interrogate_type_is_struct(TypeIndex type)
  */
 static PyObject *
-_inPU7VHDUAl(PyObject *, PyObject *args) {
+_inP07ytDUAl(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_struct((TypeIndex)param0);
@@ -1897,7 +1900,7 @@ _inPU7VHDUAl(PyObject *, PyObject *args) {
  * bool interrogate_type_is_class(TypeIndex type)
  */
 static PyObject *
-_inPU7VH1_Kf(PyObject *, PyObject *args) {
+_inP07yt1_Kf(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_class((TypeIndex)param0);
@@ -1911,7 +1914,7 @@ _inPU7VH1_Kf(PyObject *, PyObject *args) {
  * bool interrogate_type_is_union(TypeIndex type)
  */
 static PyObject *
-_inPU7VH98lD(PyObject *, PyObject *args) {
+_inP07yt98lD(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_union((TypeIndex)param0);
@@ -1925,7 +1928,7 @@ _inPU7VH98lD(PyObject *, PyObject *args) {
  * bool interrogate_type_is_fully_defined(TypeIndex type)
  */
 static PyObject *
-_inPU7VH9SHr(PyObject *, PyObject *args) {
+_inP07yt9SHr(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_fully_defined((TypeIndex)param0);
@@ -1939,7 +1942,7 @@ _inPU7VH9SHr(PyObject *, PyObject *args) {
  * bool interrogate_type_is_unpublished(TypeIndex type)
  */
 static PyObject *
-_inPU7VHdiZP(PyObject *, PyObject *args) {
+_inP07ytdiZP(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_is_unpublished((TypeIndex)param0);
@@ -1953,7 +1956,7 @@ _inPU7VHdiZP(PyObject *, PyObject *args) {
  * int interrogate_type_number_of_constructors(TypeIndex type)
  */
 static PyObject *
-_inPU7VHTdER(PyObject *, PyObject *args) {
+_inP07ytTdER(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     int return_value = interrogate_type_number_of_constructors((TypeIndex)param0);
@@ -1971,7 +1974,7 @@ _inPU7VHTdER(PyObject *, PyObject *args) {
  * FunctionIndex interrogate_type_get_constructor(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHYO56(PyObject *, PyObject *args) {
+_inP07ytYO56(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -1990,7 +1993,7 @@ _inPU7VHYO56(PyObject *, PyObject *args) {
  * bool interrogate_type_has_destructor(TypeIndex type)
  */
 static PyObject *
-_inPU7VHxtCG(PyObject *, PyObject *args) {
+_inP07ytxtCG(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_has_destructor((TypeIndex)param0);
@@ -2004,7 +2007,7 @@ _inPU7VHxtCG(PyObject *, PyObject *args) {
  * bool interrogate_type_destructor_is_inherited(TypeIndex type)
  */
 static PyObject *
-_inPU7VH_EB2(PyObject *, PyObject *args) {
+_inP07yt_EB2(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     bool return_value = interrogate_type_destructor_is_inherited((TypeIndex)param0);
@@ -2018,7 +2021,7 @@ _inPU7VH_EB2(PyObject *, PyObject *args) {
  * FunctionIndex interrogate_type_get_destructor(TypeIndex type)
  */
 static PyObject *
-_inPU7VHEG1l(PyObject *, PyObject *args) {
+_inP07ytEG1l(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     FunctionIndex return_value = interrogate_type_get_destructor((TypeIndex)param0);
@@ -2036,7 +2039,7 @@ _inPU7VHEG1l(PyObject *, PyObject *args) {
  * int interrogate_type_number_of_elements(TypeIndex type)
  */
 static PyObject *
-_inPU7VH7tUq(PyObject *, PyObject *args) {
+_inP07yt7tUq(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     int return_value = interrogate_type_number_of_elements((TypeIndex)param0);
@@ -2054,7 +2057,7 @@ _inPU7VH7tUq(PyObject *, PyObject *args) {
  * ElementIndex interrogate_type_get_element(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHyStU(PyObject *, PyObject *args) {
+_inP07ytyStU(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -2073,7 +2076,7 @@ _inPU7VHyStU(PyObject *, PyObject *args) {
  * int interrogate_type_number_of_methods(TypeIndex type)
  */
 static PyObject *
-_inPU7VHdM85(PyObject *, PyObject *args) {
+_inP07ytdM85(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     int return_value = interrogate_type_number_of_methods((TypeIndex)param0);
@@ -2091,7 +2094,7 @@ _inPU7VHdM85(PyObject *, PyObject *args) {
  * FunctionIndex interrogate_type_get_method(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHk_GN(PyObject *, PyObject *args) {
+_inP07ytk_GN(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -2110,7 +2113,7 @@ _inPU7VHk_GN(PyObject *, PyObject *args) {
  * int interrogate_type_number_of_make_seqs(TypeIndex type)
  */
 static PyObject *
-_inPU7VH8QjG(PyObject *, PyObject *args) {
+_inP07yt8QjG(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     int return_value = interrogate_type_number_of_make_seqs((TypeIndex)param0);
@@ -2128,7 +2131,7 @@ _inPU7VH8QjG(PyObject *, PyObject *args) {
  * MakeSeqIndex interrogate_type_get_make_seq(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHyMtj(PyObject *, PyObject *args) {
+_inP07ytyMtj(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -2147,7 +2150,7 @@ _inPU7VHyMtj(PyObject *, PyObject *args) {
  * int interrogate_type_number_of_casts(TypeIndex type)
  */
 static PyObject *
-_inPU7VHHDtN(PyObject *, PyObject *args) {
+_inP07ytHDtN(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     int return_value = interrogate_type_number_of_casts((TypeIndex)param0);
@@ -2165,7 +2168,7 @@ _inPU7VHHDtN(PyObject *, PyObject *args) {
  * FunctionIndex interrogate_type_get_cast(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHHFjA(PyObject *, PyObject *args) {
+_inP07ytHFjA(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -2184,7 +2187,7 @@ _inPU7VHHFjA(PyObject *, PyObject *args) {
  * int interrogate_type_number_of_derivations(TypeIndex type)
  */
 static PyObject *
-_inPU7VH_NPR(PyObject *, PyObject *args) {
+_inP07yt_NPR(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     int return_value = interrogate_type_number_of_derivations((TypeIndex)param0);
@@ -2202,7 +2205,7 @@ _inPU7VH_NPR(PyObject *, PyObject *args) {
  * TypeIndex interrogate_type_get_derivation(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHcTOH(PyObject *, PyObject *args) {
+_inP07ytcTOH(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -2221,7 +2224,7 @@ _inPU7VHcTOH(PyObject *, PyObject *args) {
  * bool interrogate_type_derivation_has_upcast(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHhdU7(PyObject *, PyObject *args) {
+_inP07ythdU7(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -2236,7 +2239,7 @@ _inPU7VHhdU7(PyObject *, PyObject *args) {
  * FunctionIndex interrogate_type_get_upcast(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHQPxU(PyObject *, PyObject *args) {
+_inP07ytQPxU(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -2255,7 +2258,7 @@ _inPU7VHQPxU(PyObject *, PyObject *args) {
  * bool interrogate_type_derivation_downcast_is_impossible(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHO7Pz(PyObject *, PyObject *args) {
+_inP07ytO7Pz(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -2270,7 +2273,7 @@ _inPU7VHO7Pz(PyObject *, PyObject *args) {
  * bool interrogate_type_derivation_has_downcast(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHvu_E(PyObject *, PyObject *args) {
+_inP07ytvu_E(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -2285,7 +2288,7 @@ _inPU7VHvu_E(PyObject *, PyObject *args) {
  * FunctionIndex interrogate_type_get_downcast(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHxGUt(PyObject *, PyObject *args) {
+_inP07ytxGUt(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -2304,7 +2307,7 @@ _inPU7VHxGUt(PyObject *, PyObject *args) {
  * int interrogate_type_number_of_nested_types(TypeIndex type)
  */
 static PyObject *
-_inPU7VHzM1P(PyObject *, PyObject *args) {
+_inP07ytzM1P(PyObject *, PyObject *args) {
   int param0;
   if (PyArg_ParseTuple(args, "i", &param0)) {
     int return_value = interrogate_type_number_of_nested_types((TypeIndex)param0);
@@ -2322,7 +2325,7 @@ _inPU7VHzM1P(PyObject *, PyObject *args) {
  * TypeIndex interrogate_type_get_nested_type(TypeIndex type, int n)
  */
 static PyObject *
-_inPU7VHoY5L(PyObject *, PyObject *args) {
+_inP07ytoY5L(PyObject *, PyObject *args) {
   int param0;
   int param1;
   if (PyArg_ParseTuple(args, "ii", &param0, &param1)) {
@@ -2336,139 +2339,169 @@ _inPU7VHoY5L(PyObject *, PyObject *args) {
   return (PyObject *)NULL;
 }
 
+/*
+ * Python simple wrapper for
+ * void interrogate_request_database(char const *database_filename)
+ */
+static PyObject *
+_inP07yte_7S(PyObject *, PyObject *args) {
+  char *param0;
+  if (PyArg_ParseTuple(args, "s", &param0)) {
+    interrogate_request_database((char const *)param0);
+    return Py_BuildValue("");
+  }
+  return (PyObject *)NULL;
+}
+
+/*
+ * Python simple wrapper for
+ * void interrogate_request_module(InterrogateModuleDef *def)
+ */
+static PyObject *
+_inP07ytw_15(PyObject *, PyObject *args) {
+  int param0;
+  if (PyArg_ParseTuple(args, "i", &param0)) {
+    interrogate_request_module((InterrogateModuleDef *)param0);
+    return Py_BuildValue("");
+  }
+  return (PyObject *)NULL;
+}
+
 
 static PyMethodDef python_simple_funcs[] = {
-  { "interrogate_add_search_directory", &_inPU7VHtbRf, METH_VARARGS },
-  { "interrogate_add_search_path", &_inPU7VHda_g, METH_VARARGS },
-  { "interrogate_error_flag", &_inPU7VH4RgX, METH_VARARGS },
-  { "interrogate_number_of_manifests", &_inPU7VH3Gip, METH_VARARGS },
-  { "interrogate_get_manifest", &_inPU7VHRKDz, METH_VARARGS },
-  { "interrogate_get_manifest_by_name", &_inPU7VHgZ9N, METH_VARARGS },
-  { "interrogate_manifest_name", &_inPU7VHFnRZ, METH_VARARGS },
-  { "interrogate_manifest_definition", &_inPU7VHg0Qv, METH_VARARGS },
-  { "interrogate_manifest_has_type", &_inPU7VHtrqw, METH_VARARGS },
-  { "interrogate_manifest_get_type", &_inPU7VHdmpW, METH_VARARGS },
-  { "interrogate_manifest_has_getter", &_inPU7VHUYgQ, METH_VARARGS },
-  { "interrogate_manifest_getter", &_inPU7VH0k7F, METH_VARARGS },
-  { "interrogate_manifest_has_int_value", &_inPU7VHfIsr, METH_VARARGS },
-  { "interrogate_manifest_get_int_value", &_inPU7VHvysR, METH_VARARGS },
-  { "interrogate_element_name", &_inPU7VHYQ_2, METH_VARARGS },
-  { "interrogate_element_scoped_name", &_inPU7VH3kdv, METH_VARARGS },
-  { "interrogate_element_has_comment", &_inPU7VHew01, METH_VARARGS },
-  { "interrogate_element_comment", &_inPU7VHQna7, METH_VARARGS },
-  { "interrogate_get_element_by_name", &_inPU7VHkg95, METH_VARARGS },
-  { "interrogate_get_element_by_scoped_name", &_inPU7VHluRc, METH_VARARGS },
-  { "interrogate_element_type", &_inPU7VHtHdM, METH_VARARGS },
-  { "interrogate_element_has_getter", &_inPU7VHDId0, METH_VARARGS },
-  { "interrogate_element_getter", &_inPU7VHHuAm, METH_VARARGS },
-  { "interrogate_element_has_setter", &_inPU7VH_xr0, METH_VARARGS },
-  { "interrogate_element_setter", &_inPU7VHH5qp, METH_VARARGS },
-  { "interrogate_number_of_globals", &_inPU7VHU2_B, METH_VARARGS },
-  { "interrogate_get_global", &_inPU7VHHFO2, METH_VARARGS },
-  { "interrogate_number_of_global_functions", &_inPU7VHcfjm, METH_VARARGS },
-  { "interrogate_get_global_function", &_inPU7VH3Sjw, METH_VARARGS },
-  { "interrogate_number_of_functions", &_inPU7VHgJcX, METH_VARARGS },
-  { "interrogate_get_function", &_inPU7VHYlw6, METH_VARARGS },
-  { "interrogate_function_name", &_inPU7VHsmnz, METH_VARARGS },
-  { "interrogate_function_scoped_name", &_inPU7VHxQ10, METH_VARARGS },
-  { "interrogate_function_has_comment", &_inPU7VH6gPB, METH_VARARGS },
-  { "interrogate_function_comment", &_inPU7VHISgV, METH_VARARGS },
-  { "interrogate_function_prototype", &_inPU7VHH3bx, METH_VARARGS },
-  { "interrogate_function_is_method", &_inPU7VHzeUk, METH_VARARGS },
-  { "interrogate_function_class", &_inPU7VHUeI5, METH_VARARGS },
-  { "interrogate_function_has_module_name", &_inPU7VHuSvx, METH_VARARGS },
-  { "interrogate_function_module_name", &_inPU7VHwpYd, METH_VARARGS },
-  { "interrogate_function_has_library_name", &_inPU7VHOfNh, METH_VARARGS },
-  { "interrogate_function_library_name", &_inPU7VHf5_U, METH_VARARGS },
-  { "interrogate_function_is_virtual", &_inPU7VHL3ZB, METH_VARARGS },
-  { "interrogate_function_number_of_c_wrappers", &_inPU7VHXw0I, METH_VARARGS },
-  { "interrogate_function_c_wrapper", &_inPU7VH3zru, METH_VARARGS },
-  { "interrogate_function_number_of_python_wrappers", &_inPU7VHRrg2, METH_VARARGS },
-  { "interrogate_function_python_wrapper", &_inPU7VHEJCx, METH_VARARGS },
-  { "interrogate_wrapper_name", &_inPU7VHWAZr, METH_VARARGS },
-  { "interrogate_wrapper_is_callable_by_name", &_inPU7VHrD_M, METH_VARARGS },
-  { "interrogate_wrapper_has_comment", &_inPU7VHjolz, METH_VARARGS },
-  { "interrogate_wrapper_comment", &_inPU7VHt_JD, METH_VARARGS },
-  { "interrogate_wrapper_has_return_value", &_inPU7VHwEts, METH_VARARGS },
-  { "interrogate_wrapper_return_type", &_inPU7VHrJWs, METH_VARARGS },
-  { "interrogate_wrapper_caller_manages_return_value", &_inPU7VHpmFD, METH_VARARGS },
-  { "interrogate_wrapper_return_value_destructor", &_inPU7VHyYUX, METH_VARARGS },
-  { "interrogate_wrapper_number_of_parameters", &_inPU7VH54dn, METH_VARARGS },
-  { "interrogate_wrapper_parameter_type", &_inPU7VHGMpW, METH_VARARGS },
-  { "interrogate_wrapper_parameter_has_name", &_inPU7VHNuBV, METH_VARARGS },
-  { "interrogate_wrapper_parameter_name", &_inPU7VH9UwA, METH_VARARGS },
-  { "interrogate_wrapper_parameter_is_this", &_inPU7VH3FDt, METH_VARARGS },
-  { "interrogate_wrapper_has_pointer", &_inPU7VHf513, METH_VARARGS },
-  { "interrogate_wrapper_pointer", &_inPU7VHsqGH, METH_VARARGS },
-  { "interrogate_wrapper_unique_name", &_inPU7VH7shV, METH_VARARGS },
-  { "interrogate_get_wrapper_by_unique_name", &_inPU7VHA1eF, METH_VARARGS },
-  { "interrogate_make_seq_class", &_inPU7VH9tTm, METH_VARARGS },
-  { "interrogate_make_seq_seq_name", &_inPU7VH776V, METH_VARARGS },
-  { "interrogate_make_seq_num_name", &_inPU7VHfaH0, METH_VARARGS },
-  { "interrogate_make_seq_element_name", &_inPU7VHGB9D, METH_VARARGS },
-  { "interrogate_number_of_global_types", &_inPU7VHsxxs, METH_VARARGS },
-  { "interrogate_get_global_type", &_inPU7VHMT0z, METH_VARARGS },
-  { "interrogate_number_of_types", &_inPU7VHiW3v, METH_VARARGS },
-  { "interrogate_get_type", &_inPU7VH4Px8, METH_VARARGS },
-  { "interrogate_get_type_by_name", &_inPU7VHNHcs, METH_VARARGS },
-  { "interrogate_get_type_by_scoped_name", &_inPU7VHqHrb, METH_VARARGS },
-  { "interrogate_get_type_by_true_name", &_inPU7VHaOqq, METH_VARARGS },
-  { "interrogate_type_name", &_inPU7VHqWOw, METH_VARARGS },
-  { "interrogate_type_scoped_name", &_inPU7VHHu7x, METH_VARARGS },
-  { "interrogate_type_true_name", &_inPU7VHwGnA, METH_VARARGS },
-  { "interrogate_type_is_nested", &_inPU7VHXGxx, METH_VARARGS },
-  { "interrogate_type_outer_class", &_inPU7VHj04Z, METH_VARARGS },
-  { "interrogate_type_has_comment", &_inPU7VHEOv4, METH_VARARGS },
-  { "interrogate_type_comment", &_inPU7VHpCqJ, METH_VARARGS },
-  { "interrogate_type_has_module_name", &_inPU7VH_Pz3, METH_VARARGS },
-  { "interrogate_type_module_name", &_inPU7VHt_06, METH_VARARGS },
-  { "interrogate_type_has_library_name", &_inPU7VHmuPs, METH_VARARGS },
-  { "interrogate_type_library_name", &_inPU7VHvM8B, METH_VARARGS },
-  { "interrogate_type_is_atomic", &_inPU7VHap97, METH_VARARGS },
-  { "interrogate_type_atomic_token", &_inPU7VH0o8D, METH_VARARGS },
-  { "interrogate_type_is_unsigned", &_inPU7VHOoQ2, METH_VARARGS },
-  { "interrogate_type_is_signed", &_inPU7VHKuFh, METH_VARARGS },
-  { "interrogate_type_is_long", &_inPU7VHo5L6, METH_VARARGS },
-  { "interrogate_type_is_longlong", &_inPU7VHzgKK, METH_VARARGS },
-  { "interrogate_type_is_short", &_inPU7VH0FIF, METH_VARARGS },
-  { "interrogate_type_is_wrapped", &_inPU7VHZqvD, METH_VARARGS },
-  { "interrogate_type_is_pointer", &_inPU7VHDyRd, METH_VARARGS },
-  { "interrogate_type_is_const", &_inPU7VHMnKa, METH_VARARGS },
-  { "interrogate_type_is_typedef", &_inPU7VHRtji, METH_VARARGS },
-  { "interrogate_type_wrapped_type", &_inPU7VHCnbQ, METH_VARARGS },
-  { "interrogate_type_is_enum", &_inPU7VHdUVN, METH_VARARGS },
-  { "interrogate_type_number_of_enum_values", &_inPU7VHihbt, METH_VARARGS },
-  { "interrogate_type_enum_value_name", &_inPU7VHbyPY, METH_VARARGS },
-  { "interrogate_type_enum_value_scoped_name", &_inPU7VHAaT6, METH_VARARGS },
-  { "interrogate_type_enum_value_comment", &_inPU7VHgL9q, METH_VARARGS },
-  { "interrogate_type_enum_value", &_inPU7VHWB97, METH_VARARGS },
-  { "interrogate_type_is_struct", &_inPU7VHDUAl, METH_VARARGS },
-  { "interrogate_type_is_class", &_inPU7VH1_Kf, METH_VARARGS },
-  { "interrogate_type_is_union", &_inPU7VH98lD, METH_VARARGS },
-  { "interrogate_type_is_fully_defined", &_inPU7VH9SHr, METH_VARARGS },
-  { "interrogate_type_is_unpublished", &_inPU7VHdiZP, METH_VARARGS },
-  { "interrogate_type_number_of_constructors", &_inPU7VHTdER, METH_VARARGS },
-  { "interrogate_type_get_constructor", &_inPU7VHYO56, METH_VARARGS },
-  { "interrogate_type_has_destructor", &_inPU7VHxtCG, METH_VARARGS },
-  { "interrogate_type_destructor_is_inherited", &_inPU7VH_EB2, METH_VARARGS },
-  { "interrogate_type_get_destructor", &_inPU7VHEG1l, METH_VARARGS },
-  { "interrogate_type_number_of_elements", &_inPU7VH7tUq, METH_VARARGS },
-  { "interrogate_type_get_element", &_inPU7VHyStU, METH_VARARGS },
-  { "interrogate_type_number_of_methods", &_inPU7VHdM85, METH_VARARGS },
-  { "interrogate_type_get_method", &_inPU7VHk_GN, METH_VARARGS },
-  { "interrogate_type_number_of_make_seqs", &_inPU7VH8QjG, METH_VARARGS },
-  { "interrogate_type_get_make_seq", &_inPU7VHyMtj, METH_VARARGS },
-  { "interrogate_type_number_of_casts", &_inPU7VHHDtN, METH_VARARGS },
-  { "interrogate_type_get_cast", &_inPU7VHHFjA, METH_VARARGS },
-  { "interrogate_type_number_of_derivations", &_inPU7VH_NPR, METH_VARARGS },
-  { "interrogate_type_get_derivation", &_inPU7VHcTOH, METH_VARARGS },
-  { "interrogate_type_derivation_has_upcast", &_inPU7VHhdU7, METH_VARARGS },
-  { "interrogate_type_get_upcast", &_inPU7VHQPxU, METH_VARARGS },
-  { "interrogate_type_derivation_downcast_is_impossible", &_inPU7VHO7Pz, METH_VARARGS },
-  { "interrogate_type_derivation_has_downcast", &_inPU7VHvu_E, METH_VARARGS },
-  { "interrogate_type_get_downcast", &_inPU7VHxGUt, METH_VARARGS },
-  { "interrogate_type_number_of_nested_types", &_inPU7VHzM1P, METH_VARARGS },
-  { "interrogate_type_get_nested_type", &_inPU7VHoY5L, METH_VARARGS },
+  { "interrogate_add_search_directory", &_inP07yttbRf, METH_VARARGS },
+  { "interrogate_add_search_path", &_inP07ytda_g, METH_VARARGS },
+  { "interrogate_error_flag", &_inP07yt4RgX, METH_VARARGS },
+  { "interrogate_number_of_manifests", &_inP07yt3Gip, METH_VARARGS },
+  { "interrogate_get_manifest", &_inP07ytRKDz, METH_VARARGS },
+  { "interrogate_get_manifest_by_name", &_inP07ytgZ9N, METH_VARARGS },
+  { "interrogate_manifest_name", &_inP07ytFnRZ, METH_VARARGS },
+  { "interrogate_manifest_definition", &_inP07ytg0Qv, METH_VARARGS },
+  { "interrogate_manifest_has_type", &_inP07yttrqw, METH_VARARGS },
+  { "interrogate_manifest_get_type", &_inP07ytdmpW, METH_VARARGS },
+  { "interrogate_manifest_has_getter", &_inP07ytUYgQ, METH_VARARGS },
+  { "interrogate_manifest_getter", &_inP07yt0k7F, METH_VARARGS },
+  { "interrogate_manifest_has_int_value", &_inP07ytfIsr, METH_VARARGS },
+  { "interrogate_manifest_get_int_value", &_inP07ytvysR, METH_VARARGS },
+  { "interrogate_element_name", &_inP07ytYQ_2, METH_VARARGS },
+  { "interrogate_element_scoped_name", &_inP07yt3kdv, METH_VARARGS },
+  { "interrogate_element_has_comment", &_inP07ytew01, METH_VARARGS },
+  { "interrogate_element_comment", &_inP07ytQna7, METH_VARARGS },
+  { "interrogate_get_element_by_name", &_inP07ytkg95, METH_VARARGS },
+  { "interrogate_get_element_by_scoped_name", &_inP07ytluRc, METH_VARARGS },
+  { "interrogate_element_type", &_inP07yttHdM, METH_VARARGS },
+  { "interrogate_element_has_getter", &_inP07ytDId0, METH_VARARGS },
+  { "interrogate_element_getter", &_inP07ytHuAm, METH_VARARGS },
+  { "interrogate_element_has_setter", &_inP07yt_xr0, METH_VARARGS },
+  { "interrogate_element_setter", &_inP07ytH5qp, METH_VARARGS },
+  { "interrogate_number_of_globals", &_inP07ytU2_B, METH_VARARGS },
+  { "interrogate_get_global", &_inP07ytHFO2, METH_VARARGS },
+  { "interrogate_number_of_global_functions", &_inP07ytcfjm, METH_VARARGS },
+  { "interrogate_get_global_function", &_inP07yt3Sjw, METH_VARARGS },
+  { "interrogate_number_of_functions", &_inP07ytgJcX, METH_VARARGS },
+  { "interrogate_get_function", &_inP07ytYlw6, METH_VARARGS },
+  { "interrogate_function_name", &_inP07ytsmnz, METH_VARARGS },
+  { "interrogate_function_scoped_name", &_inP07ytxQ10, METH_VARARGS },
+  { "interrogate_function_has_comment", &_inP07yt6gPB, METH_VARARGS },
+  { "interrogate_function_comment", &_inP07ytISgV, METH_VARARGS },
+  { "interrogate_function_prototype", &_inP07ytH3bx, METH_VARARGS },
+  { "interrogate_function_is_method", &_inP07ytzeUk, METH_VARARGS },
+  { "interrogate_function_class", &_inP07ytUeI5, METH_VARARGS },
+  { "interrogate_function_has_module_name", &_inP07ytuSvx, METH_VARARGS },
+  { "interrogate_function_module_name", &_inP07ytwpYd, METH_VARARGS },
+  { "interrogate_function_has_library_name", &_inP07ytOfNh, METH_VARARGS },
+  { "interrogate_function_library_name", &_inP07ytf5_U, METH_VARARGS },
+  { "interrogate_function_is_virtual", &_inP07ytL3ZB, METH_VARARGS },
+  { "interrogate_function_number_of_c_wrappers", &_inP07ytXw0I, METH_VARARGS },
+  { "interrogate_function_c_wrapper", &_inP07yt3zru, METH_VARARGS },
+  { "interrogate_function_number_of_python_wrappers", &_inP07ytRrg2, METH_VARARGS },
+  { "interrogate_function_python_wrapper", &_inP07ytEJCx, METH_VARARGS },
+  { "interrogate_wrapper_name", &_inP07ytWAZr, METH_VARARGS },
+  { "interrogate_wrapper_is_callable_by_name", &_inP07ytrD_M, METH_VARARGS },
+  { "interrogate_wrapper_has_comment", &_inP07ytjolz, METH_VARARGS },
+  { "interrogate_wrapper_comment", &_inP07ytt_JD, METH_VARARGS },
+  { "interrogate_wrapper_has_return_value", &_inP07ytwEts, METH_VARARGS },
+  { "interrogate_wrapper_return_type", &_inP07ytrJWs, METH_VARARGS },
+  { "interrogate_wrapper_caller_manages_return_value", &_inP07ytpmFD, METH_VARARGS },
+  { "interrogate_wrapper_return_value_destructor", &_inP07ytyYUX, METH_VARARGS },
+  { "interrogate_wrapper_number_of_parameters", &_inP07yt54dn, METH_VARARGS },
+  { "interrogate_wrapper_parameter_type", &_inP07ytGMpW, METH_VARARGS },
+  { "interrogate_wrapper_parameter_has_name", &_inP07ytNuBV, METH_VARARGS },
+  { "interrogate_wrapper_parameter_name", &_inP07yt9UwA, METH_VARARGS },
+  { "interrogate_wrapper_parameter_is_this", &_inP07yt3FDt, METH_VARARGS },
+  { "interrogate_wrapper_has_pointer", &_inP07ytf513, METH_VARARGS },
+  { "interrogate_wrapper_pointer", &_inP07ytsqGH, METH_VARARGS },
+  { "interrogate_wrapper_unique_name", &_inP07yt7shV, METH_VARARGS },
+  { "interrogate_get_wrapper_by_unique_name", &_inP07ytA1eF, METH_VARARGS },
+  { "interrogate_make_seq_class", &_inP07yt9tTm, METH_VARARGS },
+  { "interrogate_make_seq_seq_name", &_inP07yt776V, METH_VARARGS },
+  { "interrogate_make_seq_num_name", &_inP07ytfaH0, METH_VARARGS },
+  { "interrogate_make_seq_element_name", &_inP07ytGB9D, METH_VARARGS },
+  { "interrogate_number_of_global_types", &_inP07ytsxxs, METH_VARARGS },
+  { "interrogate_get_global_type", &_inP07ytMT0z, METH_VARARGS },
+  { "interrogate_number_of_types", &_inP07ytiW3v, METH_VARARGS },
+  { "interrogate_get_type", &_inP07yt4Px8, METH_VARARGS },
+  { "interrogate_get_type_by_name", &_inP07ytNHcs, METH_VARARGS },
+  { "interrogate_get_type_by_scoped_name", &_inP07ytqHrb, METH_VARARGS },
+  { "interrogate_get_type_by_true_name", &_inP07ytaOqq, METH_VARARGS },
+  { "interrogate_type_name", &_inP07ytqWOw, METH_VARARGS },
+  { "interrogate_type_scoped_name", &_inP07ytHu7x, METH_VARARGS },
+  { "interrogate_type_true_name", &_inP07ytwGnA, METH_VARARGS },
+  { "interrogate_type_is_nested", &_inP07ytXGxx, METH_VARARGS },
+  { "interrogate_type_outer_class", &_inP07ytj04Z, METH_VARARGS },
+  { "interrogate_type_has_comment", &_inP07ytEOv4, METH_VARARGS },
+  { "interrogate_type_comment", &_inP07ytpCqJ, METH_VARARGS },
+  { "interrogate_type_has_module_name", &_inP07yt_Pz3, METH_VARARGS },
+  { "interrogate_type_module_name", &_inP07ytt_06, METH_VARARGS },
+  { "interrogate_type_has_library_name", &_inP07ytmuPs, METH_VARARGS },
+  { "interrogate_type_library_name", &_inP07ytvM8B, METH_VARARGS },
+  { "interrogate_type_is_atomic", &_inP07ytap97, METH_VARARGS },
+  { "interrogate_type_atomic_token", &_inP07yt0o8D, METH_VARARGS },
+  { "interrogate_type_is_unsigned", &_inP07ytOoQ2, METH_VARARGS },
+  { "interrogate_type_is_signed", &_inP07ytKuFh, METH_VARARGS },
+  { "interrogate_type_is_long", &_inP07yto5L6, METH_VARARGS },
+  { "interrogate_type_is_longlong", &_inP07ytzgKK, METH_VARARGS },
+  { "interrogate_type_is_short", &_inP07yt0FIF, METH_VARARGS },
+  { "interrogate_type_is_wrapped", &_inP07ytZqvD, METH_VARARGS },
+  { "interrogate_type_is_pointer", &_inP07ytDyRd, METH_VARARGS },
+  { "interrogate_type_is_const", &_inP07ytMnKa, METH_VARARGS },
+  { "interrogate_type_is_typedef", &_inP07ytRtji, METH_VARARGS },
+  { "interrogate_type_wrapped_type", &_inP07ytCnbQ, METH_VARARGS },
+  { "interrogate_type_is_enum", &_inP07ytdUVN, METH_VARARGS },
+  { "interrogate_type_number_of_enum_values", &_inP07ytihbt, METH_VARARGS },
+  { "interrogate_type_enum_value_name", &_inP07ytbyPY, METH_VARARGS },
+  { "interrogate_type_enum_value_scoped_name", &_inP07ytAaT6, METH_VARARGS },
+  { "interrogate_type_enum_value_comment", &_inP07ytgL9q, METH_VARARGS },
+  { "interrogate_type_enum_value", &_inP07ytWB97, METH_VARARGS },
+  { "interrogate_type_is_struct", &_inP07ytDUAl, METH_VARARGS },
+  { "interrogate_type_is_class", &_inP07yt1_Kf, METH_VARARGS },
+  { "interrogate_type_is_union", &_inP07yt98lD, METH_VARARGS },
+  { "interrogate_type_is_fully_defined", &_inP07yt9SHr, METH_VARARGS },
+  { "interrogate_type_is_unpublished", &_inP07ytdiZP, METH_VARARGS },
+  { "interrogate_type_number_of_constructors", &_inP07ytTdER, METH_VARARGS },
+  { "interrogate_type_get_constructor", &_inP07ytYO56, METH_VARARGS },
+  { "interrogate_type_has_destructor", &_inP07ytxtCG, METH_VARARGS },
+  { "interrogate_type_destructor_is_inherited", &_inP07yt_EB2, METH_VARARGS },
+  { "interrogate_type_get_destructor", &_inP07ytEG1l, METH_VARARGS },
+  { "interrogate_type_number_of_elements", &_inP07yt7tUq, METH_VARARGS },
+  { "interrogate_type_get_element", &_inP07ytyStU, METH_VARARGS },
+  { "interrogate_type_number_of_methods", &_inP07ytdM85, METH_VARARGS },
+  { "interrogate_type_get_method", &_inP07ytk_GN, METH_VARARGS },
+  { "interrogate_type_number_of_make_seqs", &_inP07yt8QjG, METH_VARARGS },
+  { "interrogate_type_get_make_seq", &_inP07ytyMtj, METH_VARARGS },
+  { "interrogate_type_number_of_casts", &_inP07ytHDtN, METH_VARARGS },
+  { "interrogate_type_get_cast", &_inP07ytHFjA, METH_VARARGS },
+  { "interrogate_type_number_of_derivations", &_inP07yt_NPR, METH_VARARGS },
+  { "interrogate_type_get_derivation", &_inP07ytcTOH, METH_VARARGS },
+  { "interrogate_type_derivation_has_upcast", &_inP07ythdU7, METH_VARARGS },
+  { "interrogate_type_get_upcast", &_inP07ytQPxU, METH_VARARGS },
+  { "interrogate_type_derivation_downcast_is_impossible", &_inP07ytO7Pz, METH_VARARGS },
+  { "interrogate_type_derivation_has_downcast", &_inP07ytvu_E, METH_VARARGS },
+  { "interrogate_type_get_downcast", &_inP07ytxGUt, METH_VARARGS },
+  { "interrogate_type_number_of_nested_types", &_inP07ytzM1P, METH_VARARGS },
+  { "interrogate_type_get_nested_type", &_inP07ytoY5L, METH_VARARGS },
+  { "interrogate_request_database", &_inP07yte_7S, METH_VARARGS },
+  { "interrogate_request_module", &_inP07ytw_15, METH_VARARGS },
   { NULL, NULL }
 };
 
@@ -2502,3 +2535,4 @@ INIT_FUNC() {
   Py_InitModule("interrogatedb", python_simple_funcs);
 #endif
 }
+