3 files changed, 15 insertions, 17 deletions
diff --git a/sources/shiboken2/generator/generator.cpp b/sources/shiboken2/generator/generator.cpp
index 63700f2c5..7cf93edc5 100644
--- a/sources/shiboken2/generator/generator.cpp
+++ b/sources/shiboken2/generator/generator.cpp
@@ -66,17 +66,14 @@ Generator::~Generator()
 bool Generator::setup(const ApiExtractor& extractor)
 {
     m_d->apiextractor = &extractor;
-    TypeEntryHash allEntries = TypeDatabase::instance()->allEntries();
+    const auto &allEntries = TypeDatabase::instance()->entries();
     TypeEntry* entryFound = 0;
-    for (TypeEntryHash::const_iterator it = allEntries.cbegin(), end = allEntries.cend(); it != end; ++it) {
-        for (TypeEntry *entry : it.value()) {
-            if (entry->type() == TypeEntry::TypeSystemType && entry->generateCode()) {
-                entryFound = entry;
-                break;
-            }
-        }
-        if (entryFound)
+    for (auto it = allEntries.cbegin(), end = allEntries.cend(); it != end; ++it) {
+        TypeEntry *entry = it.value();
+        if (entry->type() == TypeEntry::TypeSystemType && entry->generateCode()) {
+            entryFound = entry;
             break;
+        }
     }
     if (entryFound)
         m_d->packageName = entryFound->name();
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index f230782d1..455b77c6e 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -5332,13 +5332,12 @@ bool CppGenerator::finishGeneration()
     }
 
     TypeDatabase* typeDb = TypeDatabase::instance();
-    TypeSystemTypeEntry* moduleEntry = static_cast<TypeSystemTypeEntry*>(typeDb->findType(packageName()));
+    const TypeSystemTypeEntry *moduleEntry = typeDb->findTypeSystemType(packageName());
+    Q_ASSERT(moduleEntry);
 
     //Extra includes
     s << endl << "// Extra includes" << endl;
-    QVector<Include> extraIncludes;
-    if (moduleEntry)
-        extraIncludes = moduleEntry->extraIncludes();
+    QVector<Include> extraIncludes = moduleEntry->extraIncludes();
     for (AbstractMetaEnum *cppEnum : qAsConst(globalEnums))
         extraIncludes.append(cppEnum->typeEntry()->extraIncludes());
     qSort(extraIncludes.begin(), extraIncludes.end());
@@ -5352,9 +5351,7 @@ bool CppGenerator::finishGeneration()
     s << "// Current module's converter array." << endl;
     s << "SbkConverter** " << convertersVariableName() << ';' << endl;
 
-    CodeSnipList snips;
-    if (moduleEntry)
-        snips = moduleEntry->codeSnips();
+    const CodeSnipList snips = moduleEntry->codeSnips();
 
     // module inject-code native/beginning
     if (!snips.isEmpty()) {
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
index 16f5fafd3..a03c57e98 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
@@ -2483,7 +2483,11 @@ bool ShibokenGenerator::doSetup()
     const AbstractMetaClassList &classList = classes();
     for (const AbstractMetaClass *metaClass : classList)
         getCode(snips, metaClass->typeEntry());
-    getCode(snips, td->findType(packageName()));
+
+    const TypeSystemTypeEntry *moduleEntry = td->findTypeSystemType(packageName());
+    Q_ASSERT(moduleEntry);
+    getCode(snips, moduleEntry);
+
     const FunctionGroupMap &functionGroups = getFunctionGroups();
     for (FunctionGroupMapIt it = functionGroups.cbegin(), end = functionGroups.cend(); it != end; ++it) {
         for (AbstractMetaFunction *func : it.value())