From aa2a349190fb4afee8222f53ca2c06ef5063acd7 Mon Sep 17 00:00:00 2001
From: Dimitar Dobrev <dpldobrev@protonmail.com>
Date: Sun, 30 Jun 2019 01:59:40 +0300
Subject: [PATCH] Regenerate the parser bindings

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
---
 src/CppParser/Bindings/CLI/AST.cpp            |   6 +
 src/CppParser/Bindings/CLI/CppParser.cpp      |   2 +
 src/CppParser/Bindings/CLI/Decl.cpp           |  36 +
 src/CppParser/Bindings/CLI/Expr.cpp           |  44 +
 src/CppParser/Bindings/CLI/Stmt.cpp           |   4 +
 src/CppParser/Bindings/CLI/Types.cpp          |  42 +
 .../CppSharp.CppParser.cs                     | 619 ++++++-----
 .../CSharp/i686-apple-darwin12.4.0/Std.cs     | 240 ++---
 .../i686-pc-win32-msvc/CppSharp.CppParser.cs  | 964 +++++++++--------
 .../Bindings/CSharp/i686-pc-win32-msvc/Std.cs | 662 +-----------
 .../CppSharp.CppParser.cs                     | 685 +++++++------
 .../CSharp/x86_64-apple-darwin12.4.0/Std.cs   | 240 ++---
 .../CppSharp.CppParser.cs                     | 673 +++++++-----
 .../CSharp/x86_64-linux-gnu-cxx11abi/Std.cs   | 125 +--
 .../x86_64-linux-gnu/CppSharp.CppParser.cs    | 673 +++++++-----
 .../Bindings/CSharp/x86_64-linux-gnu/Std.cs   | 105 +-
 .../CppSharp.CppParser.cs                     | 965 ++++++++++--------
 .../CSharp/x86_64-pc-win32-msvc/Std.cs        | 662 +-----------
 18 files changed, 2901 insertions(+), 3846 deletions(-)

diff --git a/src/CppParser/Bindings/CLI/AST.cpp b/src/CppParser/Bindings/CLI/AST.cpp
index fd069598..3efae205 100644
--- a/src/CppParser/Bindings/CLI/AST.cpp
+++ b/src/CppParser/Bindings/CLI/AST.cpp
@@ -669,6 +669,8 @@ void CppSharp::Parser::AST::BlockCommandComment::Arguments::set(System::Collecti
     auto _tmpvalue = std::vector<::CppSharp::CppParser::AST::BlockCommandComment::Argument>();
     for each(CppSharp::Parser::AST::BlockCommandComment::Argument^ _element in value)
     {
+        if (ReferenceEquals(_element, nullptr))
+        throw gcnew ::System::ArgumentNullException("_element", "Cannot be null because it is passed by value.");
         auto _marshalElement = *(::CppSharp::CppParser::AST::BlockCommandComment::Argument*)_element->NativePtr;
         _tmpvalue.push_back(_marshalElement);
     }
@@ -1145,6 +1147,8 @@ void CppSharp::Parser::AST::InlineCommandComment::Arguments::set(System::Collect
     auto _tmpvalue = std::vector<::CppSharp::CppParser::AST::InlineCommandComment::Argument>();
     for each(CppSharp::Parser::AST::InlineCommandComment::Argument^ _element in value)
     {
+        if (ReferenceEquals(_element, nullptr))
+        throw gcnew ::System::ArgumentNullException("_element", "Cannot be null because it is passed by value.");
         auto _marshalElement = *(::CppSharp::CppParser::AST::InlineCommandComment::Argument*)_element->NativePtr;
         _tmpvalue.push_back(_marshalElement);
     }
@@ -1349,6 +1353,8 @@ void CppSharp::Parser::AST::HTMLStartTagComment::Attributes::set(System::Collect
     auto _tmpvalue = std::vector<::CppSharp::CppParser::AST::HTMLStartTagComment::Attribute>();
     for each(CppSharp::Parser::AST::HTMLStartTagComment::Attribute^ _element in value)
     {
+        if (ReferenceEquals(_element, nullptr))
+        throw gcnew ::System::ArgumentNullException("_element", "Cannot be null because it is passed by value.");
         auto _marshalElement = *(::CppSharp::CppParser::AST::HTMLStartTagComment::Attribute*)_element->NativePtr;
         _tmpvalue.push_back(_marshalElement);
     }
diff --git a/src/CppParser/Bindings/CLI/CppParser.cpp b/src/CppParser/Bindings/CLI/CppParser.cpp
index 2a03ea9e..f2e45305 100644
--- a/src/CppParser/Bindings/CLI/CppParser.cpp
+++ b/src/CppParser/Bindings/CLI/CppParser.cpp
@@ -738,6 +738,8 @@ void CppSharp::Parser::ParserResult::Diagnostics::set(System::Collections::Gener
     auto _tmpvalue = std::vector<::CppSharp::CppParser::ParserDiagnostic>();
     for each(CppSharp::Parser::ParserDiagnostic^ _element in value)
     {
+        if (ReferenceEquals(_element, nullptr))
+        throw gcnew ::System::ArgumentNullException("_element", "Cannot be null because it is passed by value.");
         auto _marshalElement = *(::CppSharp::CppParser::ParserDiagnostic*)_element->NativePtr;
         _tmpvalue.push_back(_marshalElement);
     }
diff --git a/src/CppParser/Bindings/CLI/Decl.cpp b/src/CppParser/Bindings/CLI/Decl.cpp
index 4469f293..a6655a42 100644
--- a/src/CppParser/Bindings/CLI/Decl.cpp
+++ b/src/CppParser/Bindings/CLI/Decl.cpp
@@ -882,6 +882,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::TypedefNameDecl::Qu
 
 void CppSharp::Parser::AST::TypedefNameDecl::QualifiedType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::TypedefNameDecl*)NativePtr)->qualifiedType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -1419,6 +1421,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::Parameter::Qualifie
 
 void CppSharp::Parser::AST::Parameter::QualifiedType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::Parameter*)NativePtr)->qualifiedType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -1536,6 +1540,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::Function::ReturnTyp
 
 void CppSharp::Parser::AST::Function::ReturnType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::Function*)NativePtr)->returnType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -1738,6 +1744,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::Function::Qualified
 
 void CppSharp::Parser::AST::Function::QualifiedType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::Function*)NativePtr)->qualifiedType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -1891,6 +1899,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::Method::ConversionT
 
 void CppSharp::Parser::AST::Method::ConversionType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::Method*)NativePtr)->conversionType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -2166,6 +2176,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::Variable::Qualified
 
 void CppSharp::Parser::AST::Variable::QualifiedType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::Variable*)NativePtr)->qualifiedType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -2294,6 +2306,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::Field::QualifiedTyp
 
 void CppSharp::Parser::AST::Field::QualifiedType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::Field*)NativePtr)->qualifiedType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -2513,6 +2527,8 @@ void CppSharp::Parser::AST::VTableLayout::Components::set(System::Collections::G
     auto _tmpvalue = std::vector<::CppSharp::CppParser::AST::VTableComponent>();
     for each(CppSharp::Parser::AST::VTableComponent^ _element in value)
     {
+        if (ReferenceEquals(_element, nullptr))
+        throw gcnew ::System::ArgumentNullException("_element", "Cannot be null because it is passed by value.");
         auto _marshalElement = *(::CppSharp::CppParser::AST::VTableComponent*)_element->NativePtr;
         _tmpvalue.push_back(_marshalElement);
     }
@@ -2603,6 +2619,8 @@ CppSharp::Parser::AST::VTableLayout^ CppSharp::Parser::AST::VFTableInfo::Layout:
 
 void CppSharp::Parser::AST::VFTableInfo::Layout::set(CppSharp::Parser::AST::VTableLayout^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::VFTableInfo*)NativePtr)->layout = *(::CppSharp::CppParser::AST::VTableLayout*)value->NativePtr;
 }
 
@@ -2674,6 +2692,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::LayoutField::Qualif
 
 void CppSharp::Parser::AST::LayoutField::QualifiedType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::LayoutField*)NativePtr)->qualifiedType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -2886,6 +2906,8 @@ void CppSharp::Parser::AST::ClassLayout::VFTables::set(System::Collections::Gene
     auto _tmpvalue = std::vector<::CppSharp::CppParser::AST::VFTableInfo>();
     for each(CppSharp::Parser::AST::VFTableInfo^ _element in value)
     {
+        if (ReferenceEquals(_element, nullptr))
+        throw gcnew ::System::ArgumentNullException("_element", "Cannot be null because it is passed by value.");
         auto _marshalElement = *(::CppSharp::CppParser::AST::VFTableInfo*)_element->NativePtr;
         _tmpvalue.push_back(_marshalElement);
     }
@@ -2899,6 +2921,8 @@ CppSharp::Parser::AST::VTableLayout^ CppSharp::Parser::AST::ClassLayout::Layout:
 
 void CppSharp::Parser::AST::ClassLayout::Layout::set(CppSharp::Parser::AST::VTableLayout^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::ClassLayout*)NativePtr)->layout = *(::CppSharp::CppParser::AST::VTableLayout*)value->NativePtr;
 }
 
@@ -2969,6 +2993,8 @@ void CppSharp::Parser::AST::ClassLayout::Fields::set(System::Collections::Generi
     auto _tmpvalue = std::vector<::CppSharp::CppParser::AST::LayoutField>();
     for each(CppSharp::Parser::AST::LayoutField^ _element in value)
     {
+        if (ReferenceEquals(_element, nullptr))
+        throw gcnew ::System::ArgumentNullException("_element", "Cannot be null because it is passed by value.");
         auto _marshalElement = *(::CppSharp::CppParser::AST::LayoutField*)_element->NativePtr;
         _tmpvalue.push_back(_marshalElement);
     }
@@ -2992,6 +3018,8 @@ void CppSharp::Parser::AST::ClassLayout::Bases::set(System::Collections::Generic
     auto _tmpvalue = std::vector<::CppSharp::CppParser::AST::LayoutBase>();
     for each(CppSharp::Parser::AST::LayoutBase^ _element in value)
     {
+        if (ReferenceEquals(_element, nullptr))
+        throw gcnew ::System::ArgumentNullException("_element", "Cannot be null because it is passed by value.");
         auto _marshalElement = *(::CppSharp::CppParser::AST::LayoutBase*)_element->NativePtr;
         _tmpvalue.push_back(_marshalElement);
     }
@@ -3690,6 +3718,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::TypeTemplateParamet
 
 void CppSharp::Parser::AST::TypeTemplateParameter::DefaultArgument::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::TypeTemplateParameter*)NativePtr)->defaultArgument = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -3965,6 +3995,8 @@ void CppSharp::Parser::AST::ClassTemplateSpecialization::Arguments::set(System::
     auto _tmpvalue = std::vector<::CppSharp::CppParser::AST::TemplateArgument>();
     for each(CppSharp::Parser::AST::TemplateArgument^ _element in value)
     {
+        if (ReferenceEquals(_element, nullptr))
+        throw gcnew ::System::ArgumentNullException("_element", "Cannot be null because it is passed by value.");
         auto _marshalElement = *(::CppSharp::CppParser::AST::TemplateArgument*)_element->NativePtr;
         _tmpvalue.push_back(_marshalElement);
     }
@@ -4205,6 +4237,8 @@ void CppSharp::Parser::AST::FunctionTemplateSpecialization::Arguments::set(Syste
     auto _tmpvalue = std::vector<::CppSharp::CppParser::AST::TemplateArgument>();
     for each(CppSharp::Parser::AST::TemplateArgument^ _element in value)
     {
+        if (ReferenceEquals(_element, nullptr))
+        throw gcnew ::System::ArgumentNullException("_element", "Cannot be null because it is passed by value.");
         auto _marshalElement = *(::CppSharp::CppParser::AST::TemplateArgument*)_element->NativePtr;
         _tmpvalue.push_back(_marshalElement);
     }
@@ -4422,6 +4456,8 @@ void CppSharp::Parser::AST::VarTemplateSpecialization::Arguments::set(System::Co
     auto _tmpvalue = std::vector<::CppSharp::CppParser::AST::TemplateArgument>();
     for each(CppSharp::Parser::AST::TemplateArgument^ _element in value)
     {
+        if (ReferenceEquals(_element, nullptr))
+        throw gcnew ::System::ArgumentNullException("_element", "Cannot be null because it is passed by value.");
         auto _marshalElement = *(::CppSharp::CppParser::AST::TemplateArgument*)_element->NativePtr;
         _tmpvalue.push_back(_marshalElement);
     }
diff --git a/src/CppParser/Bindings/CLI/Expr.cpp b/src/CppParser/Bindings/CLI/Expr.cpp
index 34d56de5..88745416 100644
--- a/src/CppParser/Bindings/CLI/Expr.cpp
+++ b/src/CppParser/Bindings/CLI/Expr.cpp
@@ -188,6 +188,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::Expr::Type::get()
 
 void CppSharp::Parser::AST::Expr::Type::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::Expr*)NativePtr)->type = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -1501,6 +1503,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::UnaryExprOrTypeTrai
 
 void CppSharp::Parser::AST::UnaryExprOrTypeTraitExpr::ArgumentType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::UnaryExprOrTypeTraitExpr*)NativePtr)->argumentType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -1521,6 +1525,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::UnaryExprOrTypeTrai
 
 void CppSharp::Parser::AST::UnaryExprOrTypeTraitExpr::TypeOfArgument::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::UnaryExprOrTypeTraitExpr*)NativePtr)->typeOfArgument = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -2237,6 +2243,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::ExplicitCastExpr::T
 
 void CppSharp::Parser::AST::ExplicitCastExpr::TypeAsWritten::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::ExplicitCastExpr*)NativePtr)->typeAsWritten = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -2584,6 +2592,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::CompoundAssignOpera
 
 void CppSharp::Parser::AST::CompoundAssignOperator::ComputationLHSType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::CompoundAssignOperator*)NativePtr)->computationLHSType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -2594,6 +2604,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::CompoundAssignOpera
 
 void CppSharp::Parser::AST::CompoundAssignOperator::ComputationResultType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::CompoundAssignOperator*)NativePtr)->computationResultType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -3596,6 +3608,8 @@ CppSharp::Parser::SourceRange^ CppSharp::Parser::AST::DesignatedInitExpr::Design
 
 void CppSharp::Parser::AST::DesignatedInitExpr::Designator::SourceRange::set(CppSharp::Parser::SourceRange^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::DesignatedInitExpr::Designator*)NativePtr)->sourceRange = *(::CppSharp::CppParser::SourceRange*)value->NativePtr;
 }
 
@@ -3769,6 +3783,8 @@ CppSharp::Parser::SourceRange^ CppSharp::Parser::AST::DesignatedInitExpr::Design
 
 void CppSharp::Parser::AST::DesignatedInitExpr::DesignatorsSourceRange::set(CppSharp::Parser::SourceRange^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::DesignatedInitExpr*)NativePtr)->designatorsSourceRange = *(::CppSharp::CppParser::SourceRange*)value->NativePtr;
 }
 
@@ -4529,6 +4545,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::AtomicExpr::ValueTy
 
 void CppSharp::Parser::AST::AtomicExpr::ValueType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::AtomicExpr*)NativePtr)->valueType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -4919,6 +4937,8 @@ CppSharp::Parser::SourceRange^ CppSharp::Parser::AST::CXXNamedCastExpr::AngleBra
 
 void CppSharp::Parser::AST::CXXNamedCastExpr::AngleBrackets::set(CppSharp::Parser::SourceRange^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::CXXNamedCastExpr*)NativePtr)->angleBrackets = *(::CppSharp::CppParser::SourceRange*)value->NativePtr;
 }
 
@@ -5951,6 +5971,8 @@ CppSharp::Parser::SourceRange^ CppSharp::Parser::AST::CXXConstructExpr::ParenOrB
 
 void CppSharp::Parser::AST::CXXConstructExpr::ParenOrBraceRange::set(CppSharp::Parser::SourceRange^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::CXXConstructExpr*)NativePtr)->parenOrBraceRange = *(::CppSharp::CppParser::SourceRange*)value->NativePtr;
 }
 
@@ -6243,6 +6265,8 @@ CppSharp::Parser::SourceRange^ CppSharp::Parser::AST::LambdaExpr::IntroducerRang
 
 void CppSharp::Parser::AST::LambdaExpr::IntroducerRange::set(CppSharp::Parser::SourceRange^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::LambdaExpr*)NativePtr)->introducerRange = *(::CppSharp::CppParser::SourceRange*)value->NativePtr;
 }
 
@@ -6461,6 +6485,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::CXXNewExpr::Allocat
 
 void CppSharp::Parser::AST::CXXNewExpr::AllocatedType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::CXXNewExpr*)NativePtr)->allocatedType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -6511,6 +6537,8 @@ CppSharp::Parser::SourceRange^ CppSharp::Parser::AST::CXXNewExpr::TypeIdParens::
 
 void CppSharp::Parser::AST::CXXNewExpr::TypeIdParens::set(CppSharp::Parser::SourceRange^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::CXXNewExpr*)NativePtr)->typeIdParens = *(::CppSharp::CppParser::SourceRange*)value->NativePtr;
 }
 
@@ -6571,6 +6599,8 @@ CppSharp::Parser::SourceRange^ CppSharp::Parser::AST::CXXNewExpr::DirectInitRang
 
 void CppSharp::Parser::AST::CXXNewExpr::DirectInitRange::set(CppSharp::Parser::SourceRange^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::CXXNewExpr*)NativePtr)->directInitRange = *(::CppSharp::CppParser::SourceRange*)value->NativePtr;
 }
 
@@ -6668,6 +6698,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::CXXDeleteExpr::Dest
 
 void CppSharp::Parser::AST::CXXDeleteExpr::DestroyedType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::CXXDeleteExpr*)NativePtr)->destroyedType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -6775,6 +6807,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::CXXPseudoDestructor
 
 void CppSharp::Parser::AST::CXXPseudoDestructorExpr::DestroyedType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::CXXPseudoDestructorExpr*)NativePtr)->destroyedType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -6879,6 +6913,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::ArrayTypeTraitExpr:
 
 void CppSharp::Parser::AST::ArrayTypeTraitExpr::QueriedType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::ArrayTypeTraitExpr*)NativePtr)->queriedType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -7449,6 +7485,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::CXXUnresolvedConstr
 
 void CppSharp::Parser::AST::CXXUnresolvedConstructExpr::TypeAsWritten::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::CXXUnresolvedConstructExpr*)NativePtr)->typeAsWritten = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -7536,6 +7574,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::CXXDependentScopeMe
 
 void CppSharp::Parser::AST::CXXDependentScopeMemberExpr::BaseType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::CXXDependentScopeMemberExpr*)NativePtr)->baseType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -7707,6 +7747,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::UnresolvedMemberExp
 
 void CppSharp::Parser::AST::UnresolvedMemberExpr::BaseType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::UnresolvedMemberExpr*)NativePtr)->baseType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -8058,6 +8100,8 @@ CppSharp::Parser::AST::TemplateArgument^ CppSharp::Parser::AST::SubstNonTypeTemp
 
 void CppSharp::Parser::AST::SubstNonTypeTemplateParmPackExpr::ArgumentPack::set(CppSharp::Parser::AST::TemplateArgument^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::SubstNonTypeTemplateParmPackExpr*)NativePtr)->argumentPack = *(::CppSharp::CppParser::AST::TemplateArgument*)value->NativePtr;
 }
 
diff --git a/src/CppParser/Bindings/CLI/Stmt.cpp b/src/CppParser/Bindings/CLI/Stmt.cpp
index 4a49c8a0..0c14db26 100644
--- a/src/CppParser/Bindings/CLI/Stmt.cpp
+++ b/src/CppParser/Bindings/CLI/Stmt.cpp
@@ -86,6 +86,8 @@ CppSharp::Parser::SourceRange^ CppSharp::Parser::AST::Stmt::SourceRange::get()
 
 void CppSharp::Parser::AST::Stmt::SourceRange::set(CppSharp::Parser::SourceRange^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::Stmt*)NativePtr)->sourceRange = *(::CppSharp::CppParser::SourceRange*)value->NativePtr;
 }
 
@@ -2510,6 +2512,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::CXXCatchStmt::Caugh
 
 void CppSharp::Parser::AST::CXXCatchStmt::CaughtType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::CXXCatchStmt*)NativePtr)->caughtType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
diff --git a/src/CppParser/Bindings/CLI/Types.cpp b/src/CppParser/Bindings/CLI/Types.cpp
index a68e8835..0fa05923 100644
--- a/src/CppParser/Bindings/CLI/Types.cpp
+++ b/src/CppParser/Bindings/CLI/Types.cpp
@@ -209,6 +209,8 @@ CppSharp::Parser::AST::TypeQualifiers^ CppSharp::Parser::AST::QualifiedType::Qua
 
 void CppSharp::Parser::AST::QualifiedType::Qualifiers::set(CppSharp::Parser::AST::TypeQualifiers^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::QualifiedType*)NativePtr)->qualifiers = *(::CppSharp::CppParser::AST::TypeQualifiers*)value->NativePtr;
 }
 
@@ -291,6 +293,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::ArrayType::Qualifie
 
 void CppSharp::Parser::AST::ArrayType::QualifiedType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::ArrayType*)NativePtr)->qualifiedType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -388,6 +392,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::FunctionType::Retur
 
 void CppSharp::Parser::AST::FunctionType::ReturnType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::FunctionType*)NativePtr)->returnType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -477,6 +483,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::PointerType::Qualif
 
 void CppSharp::Parser::AST::PointerType::QualifiedPointee::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::PointerType*)NativePtr)->qualifiedPointee = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -528,6 +536,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::MemberPointerType::
 
 void CppSharp::Parser::AST::MemberPointerType::Pointee::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::MemberPointerType*)NativePtr)->pointee = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -610,6 +620,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::AttributedType::Mod
 
 void CppSharp::Parser::AST::AttributedType::Modified::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::AttributedType*)NativePtr)->modified = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -620,6 +632,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::AttributedType::Equ
 
 void CppSharp::Parser::AST::AttributedType::Equivalent::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::AttributedType*)NativePtr)->equivalent = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -661,6 +675,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::DecayedType::Decaye
 
 void CppSharp::Parser::AST::DecayedType::Decayed::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::DecayedType*)NativePtr)->decayed = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -671,6 +687,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::DecayedType::Origin
 
 void CppSharp::Parser::AST::DecayedType::Original::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::DecayedType*)NativePtr)->original = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -681,6 +699,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::DecayedType::Pointe
 
 void CppSharp::Parser::AST::DecayedType::Pointee::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::DecayedType*)NativePtr)->pointee = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -742,6 +762,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::TemplateArgument::T
 
 void CppSharp::Parser::AST::TemplateArgument::Type::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::TemplateArgument*)NativePtr)->type = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -839,6 +861,8 @@ void CppSharp::Parser::AST::TemplateSpecializationType::Arguments::set(System::C
     auto _tmpvalue = std::vector<::CppSharp::CppParser::AST::TemplateArgument>();
     for each(CppSharp::Parser::AST::TemplateArgument^ _element in value)
     {
+        if (ReferenceEquals(_element, nullptr))
+        throw gcnew ::System::ArgumentNullException("_element", "Cannot be null because it is passed by value.");
         auto _marshalElement = *(::CppSharp::CppParser::AST::TemplateArgument*)_element->NativePtr;
         _tmpvalue.push_back(_marshalElement);
     }
@@ -862,6 +886,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::TemplateSpecializat
 
 void CppSharp::Parser::AST::TemplateSpecializationType::Desugared::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::TemplateSpecializationType*)NativePtr)->desugared = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -945,6 +971,8 @@ void CppSharp::Parser::AST::DependentTemplateSpecializationType::Arguments::set(
     auto _tmpvalue = std::vector<::CppSharp::CppParser::AST::TemplateArgument>();
     for each(CppSharp::Parser::AST::TemplateArgument^ _element in value)
     {
+        if (ReferenceEquals(_element, nullptr))
+        throw gcnew ::System::ArgumentNullException("_element", "Cannot be null because it is passed by value.");
         auto _marshalElement = *(::CppSharp::CppParser::AST::TemplateArgument*)_element->NativePtr;
         _tmpvalue.push_back(_marshalElement);
     }
@@ -958,6 +986,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::DependentTemplateSp
 
 void CppSharp::Parser::AST::DependentTemplateSpecializationType::Desugared::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::DependentTemplateSpecializationType*)NativePtr)->desugared = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -1082,6 +1112,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::TemplateParameterSu
 
 void CppSharp::Parser::AST::TemplateParameterSubstitutionType::Replacement::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::TemplateParameterSubstitutionType*)NativePtr)->replacement = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -1133,6 +1165,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::InjectedClassNameTy
 
 void CppSharp::Parser::AST::InjectedClassNameType::InjectedSpecializationType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::InjectedClassNameType*)NativePtr)->injectedSpecializationType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -1190,6 +1224,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::DependentNameType::
 
 void CppSharp::Parser::AST::DependentNameType::Qualifier::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::DependentNameType*)NativePtr)->qualifier = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -1272,6 +1308,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::UnaryTransformType:
 
 void CppSharp::Parser::AST::UnaryTransformType::Desugared::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::UnaryTransformType*)NativePtr)->desugared = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -1282,6 +1320,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::UnaryTransformType:
 
 void CppSharp::Parser::AST::UnaryTransformType::BaseType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::UnaryTransformType*)NativePtr)->baseType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
@@ -1323,6 +1363,8 @@ CppSharp::Parser::AST::QualifiedType^ CppSharp::Parser::AST::VectorType::Element
 
 void CppSharp::Parser::AST::VectorType::ElementType::set(CppSharp::Parser::AST::QualifiedType^ value)
 {
+    if (ReferenceEquals(value, nullptr))
+        throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
     ((::CppSharp::CppParser::AST::VectorType*)NativePtr)->elementType = *(::CppSharp::CppParser::AST::QualifiedType*)value->NativePtr;
 }
 
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
index 0f7e1e20..6b6af6dd 100644
--- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
@@ -61,7 +61,7 @@ namespace CppSharp
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C fileName;
+                    internal global::Std.BasicString.__Internal fileName;
 
                     [FieldOffset(12)]
                     internal global::CppSharp.Parser.AST.ArchType archType;
@@ -633,7 +633,7 @@ namespace CppSharp
 
             public unsafe partial class InlineContentComment : global::CppSharp.Parser.AST.Comment, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -965,7 +965,7 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C text;
+                        internal global::Std.BasicString.__Internal text;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1520,7 +1520,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CommentKind kind;
 
                     [FieldOffset(4)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1797,7 +1797,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_N___1_S_allocator__S0_ Arguments;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1969,7 +1969,7 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C text;
+                        internal global::Std.BasicString.__Internal text;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2205,7 +2205,7 @@ namespace CppSharp
 
             public unsafe partial class HTMLTagComment : global::CppSharp.Parser.AST.InlineContentComment, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -2308,7 +2308,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C tagName;
+                    internal global::Std.BasicString.__Internal tagName;
 
                     [FieldOffset(20)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_N___1_S_allocator__S0_ Attributes;
@@ -2355,10 +2355,10 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                        internal global::Std.BasicString.__Internal name;
 
                         [FieldOffset(12)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C value;
+                        internal global::Std.BasicString.__Internal value;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2610,7 +2610,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C tagName;
+                    internal global::Std.BasicString.__Internal tagName;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2724,7 +2724,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2835,10 +2835,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.RawCommentKind kind;
 
                     [FieldOffset(4)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C briefText;
+                    internal global::Std.BasicString.__Internal briefText;
 
                     [FieldOffset(28)]
                     internal global::System.IntPtr fullCommentBlock;
@@ -3299,7 +3299,7 @@ namespace CppSharp
 
             public unsafe partial class Type : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -3557,7 +3557,7 @@ namespace CppSharp
 
             public unsafe partial class QualifiedType : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 7)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -3675,7 +3675,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.QualifiedType.__Internal*)__Instance)->qualifiers = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.TypeQualifiers.__Internal() : *(global::CppSharp.Parser.AST.TypeQualifiers.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.QualifiedType.__Internal*)__Instance)->qualifiers = *(global::CppSharp.Parser.AST.TypeQualifiers.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -3883,7 +3885,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ArrayType.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ArrayType.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4086,7 +4090,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.FunctionType.__Internal*)__Instance)->returnType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.FunctionType.__Internal*)__Instance)->returnType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4225,7 +4231,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.PointerType.__Internal*)__Instance)->qualifiedPointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.PointerType.__Internal*)__Instance)->qualifiedPointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4331,7 +4339,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.MemberPointerType.__Internal*)__Instance)->pointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.MemberPointerType.__Internal*)__Instance)->pointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4525,7 +4535,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->modified = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->modified = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4538,7 +4550,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->equivalent = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->equivalent = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4637,7 +4651,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->decayed = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->decayed = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4650,7 +4666,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->original = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->original = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4663,7 +4681,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->pointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->pointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4801,7 +4821,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateArgument.__Internal*)__Instance)->type = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateArgument.__Internal*)__Instance)->type = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5007,7 +5029,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateSpecializationType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateSpecializationType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5170,7 +5194,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DependentTemplateSpecializationType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DependentTemplateSpecializationType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5186,7 +5212,7 @@ namespace CppSharp
 
             public unsafe partial class TemplateParameterType : global::CppSharp.Parser.AST.Type, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 21)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -5439,7 +5465,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateParameterSubstitutionType.__Internal*)__Instance)->replacement = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateParameterSubstitutionType.__Internal*)__Instance)->replacement = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5553,7 +5581,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.InjectedClassNameType.__Internal*)__Instance)->injectedSpecializationType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.InjectedClassNameType.__Internal*)__Instance)->injectedSpecializationType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5591,7 +5621,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifier;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C identifier;
+                    internal global::Std.BasicString.__Internal identifier;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -5685,7 +5715,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DependentNameType.__Internal*)__Instance)->qualifier = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DependentNameType.__Internal*)__Instance)->qualifier = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5708,7 +5740,7 @@ namespace CppSharp
 
             public unsafe partial class PackExpansionType : global::CppSharp.Parser.AST.Type, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -5874,7 +5906,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5887,7 +5921,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -5983,7 +6019,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.VectorType.__Internal*)__Instance)->elementType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.VectorType.__Internal*)__Instance)->elementType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -6316,13 +6354,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -6818,7 +6856,7 @@ namespace CppSharp
 
             public unsafe partial class DeclarationContext : global::CppSharp.Parser.AST.Declaration, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 232)]
+                [StructLayout(LayoutKind.Explicit, Size = 229)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -6843,13 +6881,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -6909,7 +6947,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(216)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(228)]
                     internal byte isAnonymous;
@@ -7520,13 +7558,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -7658,7 +7696,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TypedefNameDecl.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TypedefNameDecl.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -7690,13 +7730,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -7842,13 +7882,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -8015,13 +8055,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -8170,7 +8210,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8329,7 +8369,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8432,7 +8472,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(20)]
                     internal global::System.IntPtr LHS;
@@ -8441,7 +8481,7 @@ namespace CppSharp
                     internal global::System.IntPtr RHS;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8601,7 +8641,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(20)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_N___1_S_allocator__S0_ Arguments;
@@ -8760,7 +8800,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(20)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_N___1_S_allocator__S0_ Arguments;
@@ -8934,13 +8974,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -9082,7 +9122,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Parameter.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Parameter.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9189,13 +9231,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -9255,7 +9297,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(216)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(228)]
                     internal byte isAnonymous;
@@ -9294,13 +9336,13 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CXXOperatorKind operatorKind;
 
                     [FieldOffset(256)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(268)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C signature;
+                    internal global::Std.BasicString.__Internal signature;
 
                     [FieldOffset(280)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C body;
+                    internal global::Std.BasicString.__Internal body;
 
                     [FieldOffset(292)]
                     internal global::System.IntPtr bodyStmt;
@@ -9456,7 +9498,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->returnType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->returnType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9714,7 +9758,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9755,13 +9801,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -9821,7 +9867,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(216)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(228)]
                     internal byte isAnonymous;
@@ -9860,13 +9906,13 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CXXOperatorKind operatorKind;
 
                     [FieldOffset(256)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(268)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C signature;
+                    internal global::Std.BasicString.__Internal signature;
 
                     [FieldOffset(280)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C body;
+                    internal global::Std.BasicString.__Internal body;
 
                     [FieldOffset(292)]
                     internal global::System.IntPtr bodyStmt;
@@ -10159,7 +10205,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Method.__Internal*)__Instance)->conversionType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Method.__Internal*)__Instance)->conversionType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -10213,13 +10261,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -10279,7 +10327,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(216)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(228)]
                     internal byte isAnonymous;
@@ -10372,13 +10420,13 @@ namespace CppSharp
                         internal int lineNumberEnd;
 
                         [FieldOffset(28)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                        internal global::Std.BasicString.__Internal name;
 
                         [FieldOffset(40)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                        internal global::Std.BasicString.__Internal USR;
 
                         [FieldOffset(52)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                        internal global::Std.BasicString.__Internal debugText;
 
                         [FieldOffset(64)]
                         internal byte isIncomplete;
@@ -10411,7 +10459,7 @@ namespace CppSharp
                         internal global::System.IntPtr comment;
 
                         [FieldOffset(108)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C expression;
+                        internal global::Std.BasicString.__Internal expression;
 
                         [FieldOffset(120)]
                         internal ulong value;
@@ -10721,13 +10769,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -10760,7 +10808,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(108)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(120)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -10873,7 +10921,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Variable.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Variable.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -11062,13 +11112,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -11204,7 +11254,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Field.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Field.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -11280,13 +11332,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -11850,7 +11902,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.VFTableInfo.__Internal*)__Instance)->layout = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.VTableLayout.__Internal() : *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.VFTableInfo.__Internal*)__Instance)->layout = *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -11864,7 +11918,7 @@ namespace CppSharp
                     internal uint offset;
 
                     [FieldOffset(4)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(16)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -12002,7 +12056,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.LayoutField.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.LayoutField.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -12440,7 +12496,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ClassLayout.__Internal*)__Instance)->layout = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.VTableLayout.__Internal() : *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ClassLayout.__Internal*)__Instance)->layout = *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
                     }
                 }
 
@@ -12564,13 +12622,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -12630,7 +12688,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(216)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(228)]
                     internal byte isAnonymous;
@@ -13151,13 +13209,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -13396,13 +13454,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -13526,7 +13584,7 @@ namespace CppSharp
 
             public unsafe partial class TemplateParameter : global::CppSharp.Parser.AST.Declaration, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 117)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -13551,13 +13609,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -13728,7 +13786,7 @@ namespace CppSharp
 
             public unsafe partial class TemplateTemplateParameter : global::CppSharp.Parser.AST.Template, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 127)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -13753,13 +13811,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -13956,13 +14014,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -14098,14 +14156,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TypeTemplateParameter.__Internal*)__Instance)->defaultArgument = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TypeTemplateParameter.__Internal*)__Instance)->defaultArgument = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class NonTypeTemplateParameter : global::CppSharp.Parser.AST.TemplateParameter, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 134)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -14130,13 +14190,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -14378,13 +14438,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -14629,13 +14689,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -14695,7 +14755,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(216)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(228)]
                     internal byte isAnonymous;
@@ -14945,13 +15005,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -15011,7 +15071,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(216)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(228)]
                     internal byte isAnonymous;
@@ -15181,13 +15241,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -15620,13 +15680,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -15871,13 +15931,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -15910,7 +15970,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(108)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(120)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -16115,13 +16175,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -16154,7 +16214,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(108)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(120)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -16254,7 +16314,7 @@ namespace CppSharp
 
             public unsafe partial class Namespace : global::CppSharp.Parser.AST.DeclarationContext, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 232)]
+                [StructLayout(LayoutKind.Explicit, Size = 230)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -16279,13 +16339,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -16345,7 +16405,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(216)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(228)]
                     internal byte isAnonymous;
@@ -16601,10 +16661,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.DeclarationKind kind;
 
                     [FieldOffset(12)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C expression;
+                    internal global::Std.BasicString.__Internal expression;
 
                     [FieldOffset(36)]
                     internal int lineNumberStart;
@@ -16769,10 +16829,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.DeclarationKind kind;
 
                     [FieldOffset(12)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [FieldOffset(36)]
                     internal global::System.IntPtr definition;
@@ -16938,13 +16998,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -17004,7 +17064,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(216)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(228)]
                     internal byte isAnonymous;
@@ -17013,7 +17073,7 @@ namespace CppSharp
                     internal byte isInline;
 
                     [FieldOffset(232)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C fileName;
+                    internal global::Std.BasicString.__Internal fileName;
 
                     [FieldOffset(244)]
                     internal byte isSystemHeader;
@@ -17213,7 +17273,7 @@ namespace CppSharp
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                         EntryPoint="_ZN8CppSharp9CppParser3AST10ASTContext18FindOrCreateModuleENSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE")]
-                    internal static extern global::System.IntPtr FindOrCreateModule(global::System.IntPtr __instance, global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C File);
+                    internal static extern global::System.IntPtr FindOrCreateModule(global::System.IntPtr __instance, global::System.IntPtr File);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -17316,9 +17376,8 @@ namespace CppSharp
                 {
                     var __basicString0 = new global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>();
                     global::Std.BasicStringExtensions.Assign(__basicString0, File);
-                    var __arg0 = *(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C*) __basicString0.__Instance;
+                    var __arg0 = __basicString0.__Instance;
                     var __ret = __Internal.FindOrCreateModule((__Instance + __PointerAdjustment), __arg0);
-                    __basicString0.Dispose(false);
                     global::CppSharp.Parser.AST.TranslationUnit __result0;
                     if (__ret == IntPtr.Zero) __result0 = null;
                     else if (global::CppSharp.Parser.AST.TranslationUnit.NativeToManagedMap.ContainsKey(__ret))
@@ -17639,7 +17698,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->sourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->sourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -17866,7 +17927,7 @@ namespace CppSharp
 
             public unsafe partial class NullStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 28)]
+                [StructLayout(LayoutKind.Explicit, Size = 25)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -18393,7 +18454,7 @@ namespace CppSharp
 
             public unsafe partial class CaseStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 52)]
+                [StructLayout(LayoutKind.Explicit, Size = 49)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -18927,7 +18988,7 @@ namespace CppSharp
 
             public unsafe partial class IfStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 53)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -19224,7 +19285,7 @@ namespace CppSharp
 
             public unsafe partial class SwitchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 45)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -20991,7 +21052,7 @@ namespace CppSharp
 
                 public unsafe partial class AsmStringPiece : IDisposable
                 {
-                    [StructLayout(LayoutKind.Explicit, Size = 24)]
+                    [StructLayout(LayoutKind.Explicit, Size = 21)]
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
@@ -21001,7 +21062,7 @@ namespace CppSharp
                         internal byte isOperand;
 
                         [FieldOffset(4)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
+                        internal global::Std.BasicString.__Internal @string;
 
                         [FieldOffset(16)]
                         internal uint operandNo;
@@ -21311,7 +21372,7 @@ namespace CppSharp
                     internal uint numAsmToks;
 
                     [FieldOffset(80)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C asmString;
+                    internal global::Std.BasicString.__Internal asmString;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -22495,7 +22556,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXCatchStmt.__Internal*)__Instance)->caughtType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXCatchStmt.__Internal*)__Instance)->caughtType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -23942,7 +24005,7 @@ namespace CppSharp
 
             public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 53)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -24081,7 +24144,7 @@ namespace CppSharp
 
                 public unsafe partial class Classification : IDisposable
                 {
-                    [StructLayout(LayoutKind.Explicit, Size = 16)]
+                    [StructLayout(LayoutKind.Explicit, Size = 14)]
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
@@ -24400,7 +24463,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Expr.__Internal*)__Instance)->type = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Expr.__Internal*)__Instance)->type = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -25048,7 +25113,7 @@ namespace CppSharp
 
             public unsafe partial class DeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 93)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -26225,10 +26290,10 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(68)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C bytes;
+                    internal global::Std.BasicString.__Internal bytes;
 
                     [FieldOffset(80)]
                     internal uint byteLength;
@@ -26906,7 +26971,7 @@ namespace CppSharp
 
             public unsafe partial class UnaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 76)]
+                [StructLayout(LayoutKind.Explicit, Size = 75)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -27580,7 +27645,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->argumentType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->argumentType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -27611,7 +27678,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->typeOfArgument = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->typeOfArgument = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -27840,7 +27909,7 @@ namespace CppSharp
 
             public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 100)]
+                [StructLayout(LayoutKind.Explicit, Size = 97)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -28201,7 +28270,7 @@ namespace CppSharp
 
             public unsafe partial class MemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 100)]
+                [StructLayout(LayoutKind.Explicit, Size = 97)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -28979,7 +29048,7 @@ namespace CppSharp
 
             public unsafe partial class ImplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 85)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -29314,7 +29383,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*)__Instance)->typeAsWritten = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*)__Instance)->typeAsWritten = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -29499,7 +29570,7 @@ namespace CppSharp
 
             public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 100)]
+                [StructLayout(LayoutKind.Explicit, Size = 98)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -29569,7 +29640,7 @@ namespace CppSharp
                     internal global::System.IntPtr rHS;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [FieldOffset(84)]
                     internal byte isPtrMemOp;
@@ -30048,7 +30119,7 @@ namespace CppSharp
                     internal global::System.IntPtr rHS;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [FieldOffset(84)]
                     internal byte isPtrMemOp;
@@ -30190,7 +30261,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationLHSType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationLHSType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -30203,7 +30276,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationResultType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationResultType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -32077,7 +32152,7 @@ namespace CppSharp
 
             public unsafe partial class InitListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 92)]
+                [StructLayout(LayoutKind.Explicit, Size = 89)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -32756,7 +32831,9 @@ namespace CppSharp
 
                         set
                         {
-                            ((global::CppSharp.Parser.AST.DesignatedInitExpr.Designator.__Internal*)__Instance)->sourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                            if (ReferenceEquals(value, null))
+                                throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                            ((global::CppSharp.Parser.AST.DesignatedInitExpr.Designator.__Internal*)__Instance)->sourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                         }
                     }
                 }
@@ -33067,14 +33144,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DesignatedInitExpr.__Internal*)__Instance)->designatorsSourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DesignatedInitExpr.__Internal*)__Instance)->designatorsSourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class NoInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 53)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -33524,7 +33603,7 @@ namespace CppSharp
 
             public unsafe partial class ArrayInitIndexExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 53)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -33646,7 +33725,7 @@ namespace CppSharp
 
             public unsafe partial class ImplicitValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 53)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -34198,7 +34277,7 @@ namespace CppSharp
 
             public unsafe partial class ExtVectorElementExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 70)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -35284,7 +35363,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AtomicExpr.__Internal*)__Instance)->valueType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AtomicExpr.__Internal*)__Instance)->valueType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -35382,7 +35463,7 @@ namespace CppSharp
 
             public unsafe partial class TypoExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 53)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -35504,7 +35585,7 @@ namespace CppSharp
 
             public unsafe partial class CXXOperatorCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 116)]
+                [StructLayout(LayoutKind.Explicit, Size = 113)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -36379,7 +36460,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*)__Instance)->angleBrackets = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*)__Instance)->angleBrackets = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -36544,7 +36627,7 @@ namespace CppSharp
 
             public unsafe partial class CXXDynamicCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 116)]
+                [StructLayout(LayoutKind.Explicit, Size = 113)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -37702,7 +37785,7 @@ namespace CppSharp
 
             public unsafe partial class CXXTypeidExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 62)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38248,7 +38331,7 @@ namespace CppSharp
 
             public unsafe partial class CXXUuidofExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 76)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38309,7 +38392,7 @@ namespace CppSharp
                     internal global::System.IntPtr exprOperand;
 
                     [FieldOffset(60)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C uuidStr;
+                    internal global::Std.BasicString.__Internal uuidStr;
 
                     [FieldOffset(72)]
                     internal byte isTypeOperand;
@@ -38447,7 +38530,7 @@ namespace CppSharp
 
             public unsafe partial class CXXThisExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 61)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38601,7 +38684,7 @@ namespace CppSharp
 
             public unsafe partial class CXXThrowExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 65)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -39567,7 +39650,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXConstructExpr.__Internal*)__Instance)->parenOrBraceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXConstructExpr.__Internal*)__Instance)->parenOrBraceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -39766,7 +39851,7 @@ namespace CppSharp
 
             public unsafe partial class CXXFunctionalCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 101)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -40130,7 +40215,7 @@ namespace CppSharp
 
             public unsafe partial class LambdaExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 100)]
+                [StructLayout(LayoutKind.Explicit, Size = 99)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -40379,7 +40464,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.LambdaExpr.__Internal*)__Instance)->introducerRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.LambdaExpr.__Internal*)__Instance)->introducerRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -40902,7 +40989,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->allocatedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->allocatedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -40972,7 +41061,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->typeIdParens = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->typeIdParens = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41060,7 +41151,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->directInitRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->directInitRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41297,7 +41390,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXDeleteExpr.__Internal*)__Instance)->destroyedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXDeleteExpr.__Internal*)__Instance)->destroyedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -41539,7 +41634,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXPseudoDestructorExpr.__Internal*)__Instance)->destroyedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXPseudoDestructorExpr.__Internal*)__Instance)->destroyedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41850,7 +41947,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ArrayTypeTraitExpr.__Internal*)__Instance)->queriedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ArrayTypeTraitExpr.__Internal*)__Instance)->queriedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41888,7 +41987,7 @@ namespace CppSharp
 
             public unsafe partial class ExpressionTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 61)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -42404,7 +42503,7 @@ namespace CppSharp
 
             public unsafe partial class UnresolvedLookupExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 86)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -42816,7 +42915,7 @@ namespace CppSharp
 
             public unsafe partial class ExprWithCleanups : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 68)]
+                [StructLayout(LayoutKind.Explicit, Size = 65)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -43210,7 +43309,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXUnresolvedConstructExpr.__Internal*)__Instance)->typeAsWritten = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXUnresolvedConstructExpr.__Internal*)__Instance)->typeAsWritten = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43450,7 +43551,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXDependentScopeMemberExpr.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXDependentScopeMemberExpr.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43796,7 +43899,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnresolvedMemberExpr.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnresolvedMemberExpr.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43855,7 +43960,7 @@ namespace CppSharp
 
             public unsafe partial class CXXNoexceptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 61)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -44173,7 +44278,7 @@ namespace CppSharp
 
             public unsafe partial class SizeOfPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 77)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -44702,7 +44807,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.SubstNonTypeTemplateParmPackExpr.__Internal*)__Instance)->argumentPack = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.TemplateArgument.__Internal() : *(global::CppSharp.Parser.AST.TemplateArgument.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.SubstNonTypeTemplateParmPackExpr.__Internal*)__Instance)->argumentPack = *(global::CppSharp.Parser.AST.TemplateArgument.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -44863,7 +44970,7 @@ namespace CppSharp
 
             public unsafe partial class MaterializeTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 69)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -46232,7 +46339,7 @@ namespace CppSharp
             public partial struct __Internal
             {
                 [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C ABI;
+                internal global::Std.BasicString.__Internal ABI;
 
                 [FieldOffset(12)]
                 internal global::CppSharp.Parser.ParserIntType char16Type;
@@ -47070,7 +47177,7 @@ namespace CppSharp
                 internal global::Std.Vector.__Internalc__N_std_N___1_S_vector____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C___N_std_N___1_S_allocator__S0_ Arguments;
 
                 [FieldOffset(12)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C libraryFile;
+                internal global::Std.BasicString.__Internal libraryFile;
 
                 [FieldOffset(24)]
                 internal global::Std.Vector.__Internalc__N_std_N___1_S_vector____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C___N_std_N___1_S_allocator__S0_ SourceFiles;
@@ -47100,10 +47207,10 @@ namespace CppSharp
                 internal int toolSetToUse;
 
                 [FieldOffset(116)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C targetTriple;
+                internal global::Std.BasicString.__Internal targetTriple;
 
                 [FieldOffset(128)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C currentDir;
+                internal global::Std.BasicString.__Internal currentDir;
 
                 [FieldOffset(140)]
                 internal byte noStandardIncludes;
@@ -47771,10 +47878,10 @@ namespace CppSharp
             public partial struct __Internal
             {
                 [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C fileName;
+                internal global::Std.BasicString.__Internal fileName;
 
                 [FieldOffset(12)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C message;
+                internal global::Std.BasicString.__Internal message;
 
                 [FieldOffset(24)]
                 internal global::CppSharp.Parser.ParserDiagnosticLevel level;
@@ -48180,7 +48287,7 @@ namespace CppSharp
 
         public unsafe partial class ClangParser : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 0)]
+            [StructLayout(LayoutKind.Explicit, Size = 1)]
             public partial struct __Internal
             {
                 [SuppressUnmanagedCodeSecurity]
@@ -48300,23 +48407,13 @@ namespace Std
 {
     namespace __1
     {
-        namespace Pair
+        namespace pair
         {
-            [StructLayout(LayoutKind.Explicit, Size = 16)]
-            public unsafe partial struct __Internalc__N_std_N___1_S_pair____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration
-            {
-                [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C first;
-
-                [FieldOffset(12)]
-                internal global::System.IntPtr second;
-            }
-
             [StructLayout(LayoutKind.Explicit, Size = 16)]
             public unsafe partial struct __Internalc__N_std_N___1_S_pair__1__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration
             {
                 [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C first;
+                internal global::Std.BasicString.__Internal first;
 
                 [FieldOffset(12)]
                 internal global::System.IntPtr second;
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
index 59f18b79..5d215b0e 100644
--- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
+++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
@@ -35,16 +35,6 @@ namespace Std
 
 namespace Std
 {
-    namespace CompressedPair
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal global::Std.BasicString.Rep.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C __first_;
-        }
-    }
-
     namespace Allocator
     {
         [StructLayout(LayoutKind.Explicit, Size = 0)]
@@ -110,6 +100,14 @@ namespace Std
             __Instance = IntPtr.Zero;
         }
     }
+
+    namespace CompressedPair
+    {
+        [StructLayout(LayoutKind.Explicit, Size = 4)]
+        public unsafe partial struct __Internal
+        {
+        }
+    }
 }
 
 namespace Std
@@ -117,7 +115,7 @@ namespace Std
     namespace Vector
     {
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BlockContentComment___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -130,7 +128,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_FunctionTemplateSpecialization___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -143,7 +141,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ClassTemplateSpecialization___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BlockContentComment___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -156,7 +154,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VarTemplateSpecialization___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -169,7 +167,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_MacroDefinition___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -182,7 +180,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TranslationUnit___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -195,7 +193,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -208,7 +206,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -221,7 +219,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_InlineContentComment___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -234,7 +232,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -247,7 +245,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector__i___N_std_N___1_S_allocator__i
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -260,7 +258,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VerbatimBlockLineComment___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -273,7 +271,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_InlineCommandComment_S_Argument___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -286,7 +284,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -299,7 +297,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_S_ParserDiagnostic___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -312,7 +310,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -325,7 +323,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_FunctionTemplateSpecialization___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -338,7 +336,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -351,7 +349,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -364,7 +362,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_VFTableInfo___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -377,7 +375,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_VTableComponent___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -390,7 +388,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutField___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -403,7 +401,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutBase___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -416,7 +414,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration_S_Item___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -429,20 +427,20 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
-            internal global::System.IntPtr __begin_;
+            internal global::Std.BasicString.__Internal __begin_;
 
             [FieldOffset(4)]
-            internal global::System.IntPtr __end_;
+            internal global::Std.BasicString.__Internal __end_;
 
             [FieldOffset(8)]
             internal global::Std.CompressedPair.__Internal __end_cap_;
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ClassTemplateSpecialization___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -455,7 +453,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -468,7 +466,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VarTemplateSpecialization___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -481,7 +479,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_MacroDefinition___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -494,7 +492,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TranslationUnit___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -507,7 +505,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -520,7 +518,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -533,7 +531,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_VFTableInfo___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_InlineContentComment___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -546,7 +544,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_VTableComponent___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -559,7 +557,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutField___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector__i___N_std_N___1_S_allocator__i
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -572,7 +570,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutBase___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VerbatimBlockLineComment___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -585,7 +583,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration_S_Item___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_InlineCommandComment_S_Argument___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -598,20 +596,20 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
-            internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C __begin_;
+            internal global::System.IntPtr __begin_;
 
             [FieldOffset(4)]
-            internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C __end_;
+            internal global::System.IntPtr __end_;
 
             [FieldOffset(8)]
             internal global::Std.CompressedPair.__Internal __end_cap_;
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_S_ParserDiagnostic___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -627,31 +625,6 @@ namespace Std
 
 namespace Std
 {
-    namespace Tree
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S___tree____N_std_N___1_U___value_type____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S___map_value_compare__S1__S0____N_std_N___1_S_less__S1__Vb1___N_std_N___1_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::System.IntPtr __begin_node_;
-
-            [FieldOffset(4)]
-            internal global::Std.CompressedPair.__Internal __pair1_;
-
-            [FieldOffset(8)]
-            internal global::Std.CompressedPair.__Internal __pair3_;
-        }
-    }
-
-    namespace TreeEndNode
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 4)]
-        public unsafe partial struct __Internal_Ptr
-        {
-            [FieldOffset(0)]
-            internal global::System.IntPtr __left_;
-        }
-    }
 }
 
 namespace Std
@@ -659,10 +632,8 @@ namespace Std
     namespace Map
     {
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_
+        public unsafe partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal global::Std.Tree.__Internalc__N_std_N___1_S___tree____N_std_N___1_U___value_type____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S___map_value_compare__S1__S0____N_std_N___1_S_less__S1__Vb1___N_std_N___1_S_allocator__S0_ __tree_;
         }
     }
 }
@@ -672,11 +643,8 @@ namespace Std
     namespace BasicString
     {
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
+        public unsafe partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internal __r_;
-
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                 EntryPoint="_ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2Ev")]
@@ -692,90 +660,6 @@ namespace Std
                 EntryPoint="_ZNKSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5c_strEv")]
             internal static extern global::System.IntPtr CStrc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C(global::System.IntPtr __instance);
         }
-
-        namespace Rep
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 12)]
-            public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
-            {
-                [FieldOffset(0)]
-                internal global::Std.BasicString.Rep._4.__Internal _0;
-            }
-
-            namespace _4
-            {
-                [StructLayout(LayoutKind.Explicit, Size = 12)]
-                public unsafe partial struct __Internal
-                {
-                    [FieldOffset(0)]
-                    internal global::Std.BasicString.Long.__Internal __l;
-
-                    [FieldOffset(0)]
-                    internal global::Std.BasicString.Short.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C __s;
-
-                    [FieldOffset(0)]
-                    internal global::Std.BasicString.Raw.__Internal __r;
-                }
-
-            }
-
-        }
-
-        namespace Long
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 12)]
-            public unsafe partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal uint __cap_;
-
-                [FieldOffset(4)]
-                internal uint __size_;
-
-                [FieldOffset(8)]
-                internal global::System.IntPtr __data_;
-            }
-
-        }
-
-        namespace Short
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 12)]
-            public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
-            {
-                [FieldOffset(0)]
-                internal global::Std.BasicString.Short._4.__Internal _0;
-
-                [FieldOffset(1)]
-                internal fixed sbyte __data_[11];
-            }
-
-            namespace _4
-            {
-                [StructLayout(LayoutKind.Explicit, Size = 1)]
-                public unsafe partial struct __Internal
-                {
-                    [FieldOffset(0)]
-                    internal byte __size_;
-
-                    [FieldOffset(0)]
-                    internal sbyte __lx;
-                }
-
-            }
-
-        }
-
-        namespace Raw
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 12)]
-            public unsafe partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal fixed uint __words[3];
-            }
-        }
-
     }
 
     public unsafe partial class BasicString<_CharT, _Traits, _Allocator> : IDisposable
@@ -793,19 +677,19 @@ namespace Std
             return new global::Std.BasicString<_CharT, _Traits, _Allocator>(native.ToPointer(), skipVTables);
         }
 
-        internal static global::Std.BasicString<_CharT, _Traits, _Allocator> __CreateInstance(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C native, bool skipVTables = false)
+        internal static global::Std.BasicString<_CharT, _Traits, _Allocator> __CreateInstance(global::Std.BasicString.__Internal native, bool skipVTables = false)
         {
             return new global::Std.BasicString<_CharT, _Traits, _Allocator>(native, skipVTables);
         }
 
-        private static void* __CopyValue(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C native)
+        private static void* __CopyValue(global::Std.BasicString.__Internal native)
         {
-            var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C));
-            *(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C*) ret = native;
+            var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internal));
+            *(global::Std.BasicString.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
-        private BasicString(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C native, bool skipVTables = false)
+        private BasicString(global::Std.BasicString.__Internal native, bool skipVTables = false)
             : this(__CopyValue(native), skipVTables)
         {
             __ownsNativeInstance = true;
@@ -826,10 +710,10 @@ namespace Std
             var ___Allocator = typeof(_Allocator);
             if (___CharT.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Allocator.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
             {
-                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C));
+                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internal));
                 __ownsNativeInstance = true;
                 NativeToManagedMap[__Instance] = this;
-                global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C.ctorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C((__Instance + __PointerAdjustment));
+                global::Std.BasicString.__Internal.ctorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C((__Instance + __PointerAdjustment));
                 return;
             }
             throw new ArgumentOutOfRangeException("_CharT, _Traits, _Allocator", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Allocator).FullName }), "global::Std.BasicString<_CharT, _Traits, _Allocator> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
@@ -853,7 +737,7 @@ namespace Std
                 var ___Allocator = typeof(_Allocator);
                 if (___CharT.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Allocator.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
                 {
-                    global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C.dtorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C((__Instance + __PointerAdjustment));
+                    global::Std.BasicString.__Internal.dtorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C((__Instance + __PointerAdjustment));
                     return;
                 }
                 throw new ArgumentOutOfRangeException("_CharT, _Traits, _Allocator", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Allocator).FullName }), "global::Std.BasicString<_CharT, _Traits, _Allocator> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
@@ -878,7 +762,7 @@ namespace Std
 
     namespace CharTraits
     {
-        [StructLayout(LayoutKind.Explicit, Size = 0)]
+        [StructLayout(LayoutKind.Explicit, Size = 1)]
         public unsafe partial struct __Internal
         {
         }
diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
index 5905438a..0512ffd3 100644
--- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
@@ -61,16 +61,16 @@ namespace CppSharp
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C fileName;
+                    internal global::Std.BasicString.__Internal fileName;
 
                     [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.ArchType archType;
 
                     [FieldOffset(28)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ Symbols;
+                    internal global::Std.Vector.__Internal Symbols;
 
                     [FieldOffset(40)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ Dependencies;
+                    internal global::Std.Vector.__Internal Dependencies;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -492,7 +492,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CommentKind kind;
 
                     [FieldOffset(4)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BlockContentComment___N_std_S_allocator__S0_ Blocks;
+                    internal global::Std.Vector.__Internal Blocks;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -749,7 +749,7 @@ namespace CppSharp
                     internal byte isWhitespace;
 
                     [FieldOffset(8)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_InlineContentComment___N_std_S_allocator__S0_ Content;
+                    internal global::Std.Vector.__Internal Content;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -916,7 +916,7 @@ namespace CppSharp
                     internal global::System.IntPtr paragraphComment;
 
                     [FieldOffset(12)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -965,7 +965,7 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                        internal global::Std.BasicString.__Internal text;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -1233,7 +1233,7 @@ namespace CppSharp
                     internal global::System.IntPtr paragraphComment;
 
                     [FieldOffset(12)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.ParamCommandComment.PassDirection direction;
@@ -1373,10 +1373,10 @@ namespace CppSharp
                     internal global::System.IntPtr paragraphComment;
 
                     [FieldOffset(12)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(24)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector__i___N_std_S_allocator__i Position;
+                    internal global::Std.Vector.__Internal Position;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -1520,7 +1520,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CommentKind kind;
 
                     [FieldOffset(4)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -1637,10 +1637,10 @@ namespace CppSharp
                     internal global::System.IntPtr paragraphComment;
 
                     [FieldOffset(12)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(24)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VerbatimBlockLineComment___N_std_S_allocator__S0_ Lines;
+                    internal global::Std.Vector.__Internal Lines;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -1794,10 +1794,10 @@ namespace CppSharp
                     internal global::System.IntPtr paragraphComment;
 
                     [FieldOffset(12)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -1917,7 +1917,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.InlineCommandComment.RenderKind commentRenderKind;
 
                     [FieldOffset(16)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_InlineCommandComment_S_Argument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -1969,7 +1969,7 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                        internal global::Std.BasicString.__Internal text;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -2308,10 +2308,10 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C tagName;
+                    internal global::Std.BasicString.__Internal tagName;
 
                     [FieldOffset(32)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_S_allocator__S0_ Attributes;
+                    internal global::Std.Vector.__Internal Attributes;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -2355,10 +2355,10 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                        internal global::Std.BasicString.__Internal name;
 
                         [FieldOffset(24)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C value;
+                        internal global::Std.BasicString.__Internal value;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -2610,7 +2610,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C tagName;
+                    internal global::Std.BasicString.__Internal tagName;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -2724,7 +2724,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -2835,10 +2835,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.RawCommentKind kind;
 
                     [FieldOffset(4)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C briefText;
+                    internal global::Std.BasicString.__Internal briefText;
 
                     [FieldOffset(52)]
                     internal global::System.IntPtr fullCommentBlock;
@@ -3675,7 +3675,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.QualifiedType.__Internal*)__Instance)->qualifiers = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.TypeQualifiers.__Internal() : *(global::CppSharp.Parser.AST.TypeQualifiers.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.QualifiedType.__Internal*)__Instance)->qualifiers = *(global::CppSharp.Parser.AST.TypeQualifiers.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -3883,7 +3885,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ArrayType.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ArrayType.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -3948,7 +3952,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.ExceptionSpecType exceptionSpecType;
 
                     [FieldOffset(24)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -4086,7 +4090,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.FunctionType.__Internal*)__Instance)->returnType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.FunctionType.__Internal*)__Instance)->returnType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4225,7 +4231,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.PointerType.__Internal*)__Instance)->qualifiedPointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.PointerType.__Internal*)__Instance)->qualifiedPointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4331,7 +4339,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.MemberPointerType.__Internal*)__Instance)->pointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.MemberPointerType.__Internal*)__Instance)->pointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4525,7 +4535,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->modified = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->modified = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4538,7 +4550,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->equivalent = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->equivalent = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4637,7 +4651,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->decayed = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->decayed = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4650,7 +4666,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->original = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->original = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4663,7 +4681,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->pointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->pointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4801,7 +4821,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateArgument.__Internal*)__Instance)->type = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateArgument.__Internal*)__Instance)->type = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4849,7 +4871,7 @@ namespace CppSharp
                     internal byte isDependent;
 
                     [FieldOffset(8)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(20)]
                     internal global::System.IntPtr _template;
@@ -5007,7 +5029,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateSpecializationType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateSpecializationType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5033,7 +5057,7 @@ namespace CppSharp
                     internal byte isDependent;
 
                     [FieldOffset(8)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(20)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal desugared;
@@ -5170,7 +5194,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DependentTemplateSpecializationType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DependentTemplateSpecializationType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5439,7 +5465,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateParameterSubstitutionType.__Internal*)__Instance)->replacement = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateParameterSubstitutionType.__Internal*)__Instance)->replacement = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5553,7 +5581,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.InjectedClassNameType.__Internal*)__Instance)->injectedSpecializationType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.InjectedClassNameType.__Internal*)__Instance)->injectedSpecializationType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5591,7 +5621,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifier;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C identifier;
+                    internal global::Std.BasicString.__Internal identifier;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -5685,7 +5715,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DependentNameType.__Internal*)__Instance)->qualifier = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DependentNameType.__Internal*)__Instance)->qualifier = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5874,7 +5906,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5887,7 +5921,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -5983,7 +6019,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.VectorType.__Internal*)__Instance)->elementType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.VectorType.__Internal*)__Instance)->elementType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -6316,13 +6354,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -6343,10 +6381,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -6843,13 +6881,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -6870,10 +6908,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -6882,34 +6920,34 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(144)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(156)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(168)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(180)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(192)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(204)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(216)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(228)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(240)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(252)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(260)]
                     internal byte isAnonymous;
@@ -7520,13 +7558,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -7547,10 +7585,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -7658,7 +7696,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TypedefNameDecl.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TypedefNameDecl.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -7690,13 +7730,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -7717,10 +7757,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -7842,13 +7882,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -7869,10 +7909,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -8015,13 +8055,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -8042,10 +8082,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -8170,7 +8210,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -8329,7 +8369,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -8432,7 +8472,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(32)]
                     internal global::System.IntPtr LHS;
@@ -8441,7 +8481,7 @@ namespace CppSharp
                     internal global::System.IntPtr RHS;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -8601,10 +8641,10 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(32)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -8760,10 +8800,10 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(32)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -8934,13 +8974,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -8961,10 +9001,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -9082,7 +9122,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Parameter.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Parameter.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9189,13 +9231,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -9216,10 +9258,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -9228,34 +9270,34 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(144)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(156)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(168)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(180)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(192)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(204)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(216)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(228)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(240)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(252)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(260)]
                     internal byte isAnonymous;
@@ -9294,13 +9336,13 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CXXOperatorKind operatorKind;
 
                     [FieldOffset(288)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(312)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C signature;
+                    internal global::Std.BasicString.__Internal signature;
 
                     [FieldOffset(336)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C body;
+                    internal global::Std.BasicString.__Internal body;
 
                     [FieldOffset(360)]
                     internal global::System.IntPtr bodyStmt;
@@ -9309,7 +9351,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CallingConvention callingConvention;
 
                     [FieldOffset(368)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [FieldOffset(380)]
                     internal global::System.IntPtr specializationInfo;
@@ -9456,7 +9498,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->returnType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->returnType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9714,7 +9758,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9755,13 +9801,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -9782,10 +9828,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -9794,34 +9840,34 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(144)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(156)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(168)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(180)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(192)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(204)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(216)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(228)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(240)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(252)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(260)]
                     internal byte isAnonymous;
@@ -9860,13 +9906,13 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CXXOperatorKind operatorKind;
 
                     [FieldOffset(288)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(312)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C signature;
+                    internal global::Std.BasicString.__Internal signature;
 
                     [FieldOffset(336)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C body;
+                    internal global::Std.BasicString.__Internal body;
 
                     [FieldOffset(360)]
                     internal global::System.IntPtr bodyStmt;
@@ -9875,7 +9921,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CallingConvention callingConvention;
 
                     [FieldOffset(368)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [FieldOffset(380)]
                     internal global::System.IntPtr specializationInfo;
@@ -9917,7 +9963,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.RefQualifierKind refQualifier;
 
                     [FieldOffset(420)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_S_allocator__S0_ OverriddenMethods;
+                    internal global::Std.Vector.__Internal OverriddenMethods;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -10159,7 +10205,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Method.__Internal*)__Instance)->conversionType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Method.__Internal*)__Instance)->conversionType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -10213,13 +10261,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -10240,10 +10288,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -10252,34 +10300,34 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(144)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(156)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(168)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(180)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(192)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(204)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(216)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(228)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(240)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(252)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(260)]
                     internal byte isAnonymous;
@@ -10294,7 +10342,7 @@ namespace CppSharp
                     internal global::System.IntPtr builtinType;
 
                     [FieldOffset(276)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration_S_Item___N_std_S_allocator__S0_ Items;
+                    internal global::Std.Vector.__Internal Items;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -10372,13 +10420,13 @@ namespace CppSharp
                         internal int lineNumberEnd;
 
                         [FieldOffset(28)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                        internal global::Std.BasicString.__Internal name;
 
                         [FieldOffset(52)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                        internal global::Std.BasicString.__Internal USR;
 
                         [FieldOffset(76)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                        internal global::Std.BasicString.__Internal debugText;
 
                         [FieldOffset(100)]
                         internal byte isIncomplete;
@@ -10399,10 +10447,10 @@ namespace CppSharp
                         internal uint definitionOrder;
 
                         [FieldOffset(112)]
-                        internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                        internal global::Std.Vector.__Internal PreprocessedEntities;
 
                         [FieldOffset(124)]
-                        internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                        internal global::Std.Vector.__Internal Redeclarations;
 
                         [FieldOffset(136)]
                         internal global::System.IntPtr originalPtr;
@@ -10411,7 +10459,7 @@ namespace CppSharp
                         internal global::System.IntPtr comment;
 
                         [FieldOffset(144)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C expression;
+                        internal global::Std.BasicString.__Internal expression;
 
                         [FieldOffset(168)]
                         internal ulong value;
@@ -10721,13 +10769,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -10748,10 +10796,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -10760,7 +10808,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(144)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(168)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -10873,7 +10921,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Variable.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Variable.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -11062,13 +11112,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -11089,10 +11139,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -11204,7 +11254,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Field.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Field.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -11280,13 +11332,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -11307,10 +11359,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -11549,7 +11601,7 @@ namespace CppSharp
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_VTableComponent___N_std_S_allocator__S0_ Components;
+                    internal global::Std.Vector.__Internal Components;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -11850,7 +11902,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.VFTableInfo.__Internal*)__Instance)->layout = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.VTableLayout.__Internal() : *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.VFTableInfo.__Internal*)__Instance)->layout = *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -11864,7 +11918,7 @@ namespace CppSharp
                     internal uint offset;
 
                     [FieldOffset(4)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(28)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -12002,7 +12056,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.LayoutField.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.LayoutField.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -12167,7 +12223,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.RecordArgABI argABI;
 
                     [FieldOffset(8)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_VFTableInfo___N_std_S_allocator__S0_ VFTables;
+                    internal global::Std.Vector.__Internal VFTables;
 
                     [FieldOffset(20)]
                     internal global::CppSharp.Parser.AST.VTableLayout.__Internal layout;
@@ -12188,10 +12244,10 @@ namespace CppSharp
                     internal int dataSize;
 
                     [FieldOffset(52)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutField___N_std_S_allocator__S0_ Fields;
+                    internal global::Std.Vector.__Internal Fields;
 
                     [FieldOffset(64)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutBase___N_std_S_allocator__S0_ Bases;
+                    internal global::Std.Vector.__Internal Bases;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -12440,7 +12496,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ClassLayout.__Internal*)__Instance)->layout = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.VTableLayout.__Internal() : *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ClassLayout.__Internal*)__Instance)->layout = *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
                     }
                 }
 
@@ -12564,13 +12622,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -12591,10 +12649,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -12603,49 +12661,49 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(144)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(156)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(168)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(180)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(192)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(204)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(216)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(228)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(240)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(252)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(260)]
                     internal byte isAnonymous;
 
                     [FieldOffset(264)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_S_allocator__S0_ Bases;
+                    internal global::Std.Vector.__Internal Bases;
 
                     [FieldOffset(276)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_S_allocator__S0_ Fields;
+                    internal global::Std.Vector.__Internal Fields;
 
                     [FieldOffset(288)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_S_allocator__S0_ Methods;
+                    internal global::Std.Vector.__Internal Methods;
 
                     [FieldOffset(300)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_S_allocator__S0_ Specifiers;
+                    internal global::Std.Vector.__Internal Specifiers;
 
                     [FieldOffset(312)]
                     internal byte isPOD;
@@ -13151,13 +13209,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -13178,10 +13236,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -13193,7 +13251,7 @@ namespace CppSharp
                     internal global::System.IntPtr TemplatedDecl;
 
                     [FieldOffset(148)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -13396,13 +13454,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -13423,10 +13481,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -13438,7 +13496,7 @@ namespace CppSharp
                     internal global::System.IntPtr TemplatedDecl;
 
                     [FieldOffset(148)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -13551,13 +13609,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -13578,10 +13636,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -13753,13 +13811,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -13780,10 +13838,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -13795,7 +13853,7 @@ namespace CppSharp
                     internal global::System.IntPtr TemplatedDecl;
 
                     [FieldOffset(148)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [FieldOffset(160)]
                     internal byte isParameterPack;
@@ -13956,13 +14014,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -13983,10 +14041,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -14098,7 +14156,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TypeTemplateParameter.__Internal*)__Instance)->defaultArgument = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TypeTemplateParameter.__Internal*)__Instance)->defaultArgument = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -14130,13 +14190,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -14157,10 +14217,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -14378,13 +14438,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -14405,10 +14465,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -14420,10 +14480,10 @@ namespace CppSharp
                     internal global::System.IntPtr TemplatedDecl;
 
                     [FieldOffset(148)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ClassTemplateSpecialization___N_std_S_allocator__S0_ Specializations;
+                    internal global::Std.Vector.__Internal Specializations;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -14629,13 +14689,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -14656,10 +14716,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -14668,49 +14728,49 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(144)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(156)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(168)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(180)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(192)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(204)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(216)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(228)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(240)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(252)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(260)]
                     internal byte isAnonymous;
 
                     [FieldOffset(264)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_S_allocator__S0_ Bases;
+                    internal global::Std.Vector.__Internal Bases;
 
                     [FieldOffset(276)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_S_allocator__S0_ Fields;
+                    internal global::Std.Vector.__Internal Fields;
 
                     [FieldOffset(288)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_S_allocator__S0_ Methods;
+                    internal global::Std.Vector.__Internal Methods;
 
                     [FieldOffset(300)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_S_allocator__S0_ Specifiers;
+                    internal global::Std.Vector.__Internal Specifiers;
 
                     [FieldOffset(312)]
                     internal byte isPOD;
@@ -14749,7 +14809,7 @@ namespace CppSharp
                     internal global::System.IntPtr templatedDecl;
 
                     [FieldOffset(332)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(344)]
                     internal global::CppSharp.Parser.AST.TemplateSpecializationKind specializationKind;
@@ -14945,13 +15005,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -14972,10 +15032,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -14984,49 +15044,49 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(144)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(156)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(168)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(180)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(192)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(204)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(216)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(228)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(240)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(252)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(260)]
                     internal byte isAnonymous;
 
                     [FieldOffset(264)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_S_allocator__S0_ Bases;
+                    internal global::Std.Vector.__Internal Bases;
 
                     [FieldOffset(276)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_S_allocator__S0_ Fields;
+                    internal global::Std.Vector.__Internal Fields;
 
                     [FieldOffset(288)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_S_allocator__S0_ Methods;
+                    internal global::Std.Vector.__Internal Methods;
 
                     [FieldOffset(300)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_S_allocator__S0_ Specifiers;
+                    internal global::Std.Vector.__Internal Specifiers;
 
                     [FieldOffset(312)]
                     internal byte isPOD;
@@ -15065,7 +15125,7 @@ namespace CppSharp
                     internal global::System.IntPtr templatedDecl;
 
                     [FieldOffset(332)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(344)]
                     internal global::CppSharp.Parser.AST.TemplateSpecializationKind specializationKind;
@@ -15181,13 +15241,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -15208,10 +15268,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -15223,10 +15283,10 @@ namespace CppSharp
                     internal global::System.IntPtr TemplatedDecl;
 
                     [FieldOffset(148)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_FunctionTemplateSpecialization___N_std_S_allocator__S0_ Specializations;
+                    internal global::Std.Vector.__Internal Specializations;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -15394,7 +15454,7 @@ namespace CppSharp
                     internal global::System.IntPtr _template;
 
                     [FieldOffset(4)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(16)]
                     internal global::System.IntPtr specializedFunction;
@@ -15620,13 +15680,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -15647,10 +15707,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -15662,10 +15722,10 @@ namespace CppSharp
                     internal global::System.IntPtr TemplatedDecl;
 
                     [FieldOffset(148)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VarTemplateSpecialization___N_std_S_allocator__S0_ Specializations;
+                    internal global::Std.Vector.__Internal Specializations;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -15871,13 +15931,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -15898,10 +15958,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -15910,7 +15970,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(144)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(168)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -15919,7 +15979,7 @@ namespace CppSharp
                     internal global::System.IntPtr templatedDecl;
 
                     [FieldOffset(180)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(192)]
                     internal global::CppSharp.Parser.AST.TemplateSpecializationKind specializationKind;
@@ -16115,13 +16175,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -16142,10 +16202,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -16154,7 +16214,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(144)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(168)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -16163,7 +16223,7 @@ namespace CppSharp
                     internal global::System.IntPtr templatedDecl;
 
                     [FieldOffset(180)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(192)]
                     internal global::CppSharp.Parser.AST.TemplateSpecializationKind specializationKind;
@@ -16279,13 +16339,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -16306,10 +16366,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -16318,34 +16378,34 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(144)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(156)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(168)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(180)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(192)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(204)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(216)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(228)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(240)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(252)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(260)]
                     internal byte isAnonymous;
@@ -16601,10 +16661,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.DeclarationKind kind;
 
                     [FieldOffset(12)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(36)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C expression;
+                    internal global::Std.BasicString.__Internal expression;
 
                     [FieldOffset(60)]
                     internal int lineNumberStart;
@@ -16769,10 +16829,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.DeclarationKind kind;
 
                     [FieldOffset(12)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(36)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [FieldOffset(60)]
                     internal global::System.IntPtr definition;
@@ -16938,13 +16998,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(28)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(52)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(76)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(100)]
                     internal byte isIncomplete;
@@ -16965,10 +17025,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(112)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(124)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(136)]
                     internal global::System.IntPtr originalPtr;
@@ -16977,34 +17037,34 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(144)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(156)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(168)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(180)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(192)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(204)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(216)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(228)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(240)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(252)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(260)]
                     internal byte isAnonymous;
@@ -17013,13 +17073,13 @@ namespace CppSharp
                     internal byte isInline;
 
                     [FieldOffset(268)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C fileName;
+                    internal global::Std.BasicString.__Internal fileName;
 
                     [FieldOffset(292)]
                     internal byte isSystemHeader;
 
                     [FieldOffset(296)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_MacroDefinition___N_std_S_allocator__S0_ Macros;
+                    internal global::Std.Vector.__Internal Macros;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -17193,7 +17253,7 @@ namespace CppSharp
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TranslationUnit___N_std_S_allocator__S0_ TranslationUnits;
+                    internal global::Std.Vector.__Internal TranslationUnits;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -17213,7 +17273,7 @@ namespace CppSharp
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                         EntryPoint="?FindOrCreateModule@ASTContext@AST@CppParser@CppSharp@@QAEPAVTranslationUnit@234@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z")]
-                    internal static extern global::System.IntPtr FindOrCreateModule(global::System.IntPtr __instance, global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C File);
+                    internal static extern global::System.IntPtr FindOrCreateModule(global::System.IntPtr __instance, global::Std.BasicString.__Internal File);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -17316,7 +17376,7 @@ namespace CppSharp
                 {
                     var __basicString0 = new global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>();
                     global::Std.BasicStringExtensions.Assign(__basicString0, File);
-                    var __arg0 = *(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C*) __basicString0.__Instance;
+                    var __arg0 = *(global::Std.BasicString.__Internal*) __basicString0.__Instance;
                     var __ret = __Internal.FindOrCreateModule((__Instance + __PointerAdjustment), __arg0);
                     __basicString0.Dispose(false);
                     global::CppSharp.Parser.AST.TranslationUnit __result0;
@@ -17639,7 +17699,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->sourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->sourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -17688,7 +17750,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ decls;
+                    internal global::Std.Vector.__Internal decls;
 
                     [FieldOffset(32)]
                     internal byte isSingleDecl;
@@ -17994,7 +18056,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_S_allocator__S0_ body;
+                    internal global::Std.Vector.__Internal body;
 
                     [FieldOffset(32)]
                     internal byte body_empty;
@@ -20600,10 +20662,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
+                    internal global::Std.Vector.__Internal inputs;
 
                     [FieldOffset(32)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
+                    internal global::Std.Vector.__Internal outputs;
 
                     [FieldOffset(44)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
@@ -20944,10 +21006,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
+                    internal global::Std.Vector.__Internal inputs;
 
                     [FieldOffset(32)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
+                    internal global::Std.Vector.__Internal outputs;
 
                     [FieldOffset(44)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
@@ -21001,7 +21063,7 @@ namespace CppSharp
                         internal byte isOperand;
 
                         [FieldOffset(4)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                        internal global::Std.BasicString.__Internal @string;
 
                         [FieldOffset(28)]
                         internal uint operandNo;
@@ -21275,10 +21337,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
+                    internal global::Std.Vector.__Internal inputs;
 
                     [FieldOffset(32)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
+                    internal global::Std.Vector.__Internal outputs;
 
                     [FieldOffset(44)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
@@ -21311,7 +21373,7 @@ namespace CppSharp
                     internal uint numAsmToks;
 
                     [FieldOffset(80)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C asmString;
+                    internal global::Std.BasicString.__Internal asmString;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -22017,7 +22079,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(20)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ capture_inits;
+                    internal global::Std.Vector.__Internal capture_inits;
 
                     [FieldOffset(32)]
                     internal global::System.IntPtr capturedStmt;
@@ -22495,7 +22557,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXCatchStmt.__Internal*)__Instance)->caughtType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXCatchStmt.__Internal*)__Instance)->caughtType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -24400,7 +24464,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Expr.__Internal*)__Instance)->type = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Expr.__Internal*)__Instance)->type = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -26225,10 +26291,10 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(80)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C bytes;
+                    internal global::Std.BasicString.__Internal bytes;
 
                     [FieldOffset(104)]
                     internal uint byteLength;
@@ -27580,7 +27646,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->argumentType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->argumentType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -27611,7 +27679,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->typeOfArgument = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->typeOfArgument = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -27898,7 +27968,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(56)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(68)]
                     internal global::System.IntPtr callee;
@@ -29314,7 +29384,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*)__Instance)->typeAsWritten = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*)__Instance)->typeAsWritten = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -29569,7 +29641,7 @@ namespace CppSharp
                     internal global::System.IntPtr rHS;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [FieldOffset(96)]
                     internal byte isPtrMemOp;
@@ -30048,7 +30120,7 @@ namespace CppSharp
                     internal global::System.IntPtr rHS;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [FieldOffset(96)]
                     internal byte isPtrMemOp;
@@ -30190,7 +30262,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationLHSType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationLHSType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -30203,7 +30277,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationResultType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationResultType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -32756,7 +32832,9 @@ namespace CppSharp
 
                         set
                         {
-                            ((global::CppSharp.Parser.AST.DesignatedInitExpr.Designator.__Internal*)__Instance)->sourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                            if (ReferenceEquals(value, null))
+                                throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                            ((global::CppSharp.Parser.AST.DesignatedInitExpr.Designator.__Internal*)__Instance)->sourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                         }
                     }
                 }
@@ -33067,7 +33145,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DesignatedInitExpr.__Internal*)__Instance)->designatorsSourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DesignatedInitExpr.__Internal*)__Instance)->designatorsSourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -35284,7 +35364,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AtomicExpr.__Internal*)__Instance)->valueType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AtomicExpr.__Internal*)__Instance)->valueType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -35562,7 +35644,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(56)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(68)]
                     internal global::System.IntPtr callee;
@@ -35812,7 +35894,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(56)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(68)]
                     internal global::System.IntPtr callee;
@@ -36024,7 +36106,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(56)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(68)]
                     internal global::System.IntPtr callee;
@@ -36379,7 +36461,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*)__Instance)->angleBrackets = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*)__Instance)->angleBrackets = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -37092,7 +37176,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(56)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(68)]
                     internal global::System.IntPtr callee;
@@ -38309,7 +38393,7 @@ namespace CppSharp
                     internal global::System.IntPtr exprOperand;
 
                     [FieldOffset(60)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C uuidStr;
+                    internal global::Std.BasicString.__Internal uuidStr;
 
                     [FieldOffset(84)]
                     internal byte isTypeOperand;
@@ -39300,7 +39384,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(56)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
@@ -39567,7 +39651,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXConstructExpr.__Internal*)__Instance)->parenOrBraceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXConstructExpr.__Internal*)__Instance)->parenOrBraceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -40018,7 +40104,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(56)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
@@ -40188,7 +40274,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(56)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ capture_inits;
+                    internal global::Std.Vector.__Internal capture_inits;
 
                     [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal captureDefaultLoc;
@@ -40379,7 +40465,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.LambdaExpr.__Internal*)__Instance)->introducerRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.LambdaExpr.__Internal*)__Instance)->introducerRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -40679,7 +40767,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(56)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ placement_arguments;
+                    internal global::Std.Vector.__Internal placement_arguments;
 
                     [FieldOffset(68)]
                     internal global::System.IntPtr operatorNew;
@@ -40902,7 +40990,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->allocatedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->allocatedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -40972,7 +41062,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->typeIdParens = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->typeIdParens = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41060,7 +41152,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->directInitRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->directInitRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41297,7 +41391,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXDeleteExpr.__Internal*)__Instance)->destroyedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXDeleteExpr.__Internal*)__Instance)->destroyedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -41539,7 +41635,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXPseudoDestructorExpr.__Internal*)__Instance)->destroyedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXPseudoDestructorExpr.__Internal*)__Instance)->destroyedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41850,7 +41948,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ArrayTypeTraitExpr.__Internal*)__Instance)->queriedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ArrayTypeTraitExpr.__Internal*)__Instance)->queriedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43031,7 +43131,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(56)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(68)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
@@ -43210,7 +43310,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXUnresolvedConstructExpr.__Internal*)__Instance)->typeAsWritten = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXUnresolvedConstructExpr.__Internal*)__Instance)->typeAsWritten = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43450,7 +43552,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXDependentScopeMemberExpr.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXDependentScopeMemberExpr.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43796,7 +43900,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnresolvedMemberExpr.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnresolvedMemberExpr.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -44702,7 +44808,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.SubstNonTypeTemplateParmPackExpr.__Internal*)__Instance)->argumentPack = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.TemplateArgument.__Internal() : *(global::CppSharp.Parser.AST.TemplateArgument.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.SubstNonTypeTemplateParmPackExpr.__Internal*)__Instance)->argumentPack = *(global::CppSharp.Parser.AST.TemplateArgument.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -46232,7 +46340,7 @@ namespace CppSharp
             public partial struct __Internal
             {
                 [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C ABI;
+                internal global::Std.BasicString.__Internal ABI;
 
                 [FieldOffset(24)]
                 internal global::CppSharp.Parser.ParserIntType char16Type;
@@ -47067,31 +47175,31 @@ namespace CppSharp
             public partial struct __Internal
             {
                 [FieldOffset(0)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ Arguments;
+                internal global::Std.Vector.__Internal Arguments;
 
                 [FieldOffset(12)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C libraryFile;
+                internal global::Std.BasicString.__Internal libraryFile;
 
                 [FieldOffset(36)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ SourceFiles;
+                internal global::Std.Vector.__Internal SourceFiles;
 
                 [FieldOffset(48)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ IncludeDirs;
+                internal global::Std.Vector.__Internal IncludeDirs;
 
                 [FieldOffset(60)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ SystemIncludeDirs;
+                internal global::Std.Vector.__Internal SystemIncludeDirs;
 
                 [FieldOffset(72)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ Defines;
+                internal global::Std.Vector.__Internal Defines;
 
                 [FieldOffset(84)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ Undefines;
+                internal global::Std.Vector.__Internal Undefines;
 
                 [FieldOffset(96)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ LibraryDirs;
+                internal global::Std.Vector.__Internal LibraryDirs;
 
                 [FieldOffset(108)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ SupportedStdTypes;
+                internal global::Std.Vector.__Internal SupportedStdTypes;
 
                 [FieldOffset(120)]
                 internal global::System.IntPtr ASTContext;
@@ -47100,10 +47208,10 @@ namespace CppSharp
                 internal int toolSetToUse;
 
                 [FieldOffset(128)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C targetTriple;
+                internal global::Std.BasicString.__Internal targetTriple;
 
                 [FieldOffset(152)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C currentDir;
+                internal global::Std.BasicString.__Internal currentDir;
 
                 [FieldOffset(176)]
                 internal byte noStandardIncludes;
@@ -47771,10 +47879,10 @@ namespace CppSharp
             public partial struct __Internal
             {
                 [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C fileName;
+                internal global::Std.BasicString.__Internal fileName;
 
                 [FieldOffset(24)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C message;
+                internal global::Std.BasicString.__Internal message;
 
                 [FieldOffset(48)]
                 internal global::CppSharp.Parser.ParserDiagnosticLevel level;
@@ -47958,7 +48066,7 @@ namespace CppSharp
                 internal global::CppSharp.Parser.ParserResultKind kind;
 
                 [FieldOffset(4)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_S_ParserDiagnostic___N_std_S_allocator__S0_ Diagnostics;
+                internal global::Std.Vector.__Internal Diagnostics;
 
                 [FieldOffset(16)]
                 internal global::System.IntPtr library;
@@ -48298,13 +48406,13 @@ namespace CppSharp
 
 namespace Std
 {
-    namespace Pair
+    namespace pair
     {
         [StructLayout(LayoutKind.Explicit, Size = 28)]
         public unsafe partial struct __Internalc__N_std_S_pair__1__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration
         {
             [FieldOffset(0)]
-            internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C first;
+            internal global::Std.BasicString.__Internal first;
 
             [FieldOffset(24)]
             internal global::System.IntPtr second;
diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
index 0798a0bd..8fad8a81 100644
--- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
+++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
@@ -82,310 +82,6 @@ namespace Std
     }
 }
 
-namespace Std
-{
-}
-
-namespace Std
-{
-    namespace CompressedPair
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator__C___N_std_S__String_val____N_std_S__Simple_types__C_Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.StringVal.__Internalc__N_std_S__String_val____N_std_S__Simple_types__C _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_BlockContentComment___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 8)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_less____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S__Compressed_pair____N_std_S_allocator____N_std_S__Tree_node____N_std_S_pair__1S1_____N_CppSharp_N_CppParser_N_AST_S_Declaration__v___N_std_S__Tree_val____N_std_S__Tree_simple_types__S7__Vb1_Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_std_S__Tree_node____N_std_S_pair__1__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration__v___N_std_S__Tree_val____N_std_S__Tree_simple_types__S2__Vb1 _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 8)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_std_S__Tree_node____N_std_S_pair__1__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration__v___N_std_S__Tree_val____N_std_S__Tree_simple_types__S2__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.TreeVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_FunctionTemplateSpecialization___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_VTableComponent___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_VFTableInfo___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_LayoutField___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_LayoutBase___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Enumeration_S_Item___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_ClassTemplateSpecialization___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_VarTemplateSpecialization___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_MacroDefinition___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_TranslationUnit___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_InlineContentComment___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator__i___N_std_S__Vector_val____N_std_S__Simple_types__i_Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_VerbatimBlockLineComment___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_InlineCommandComment_S_Argument___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_S_ParserDiagnostic___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-    }
-}
-
 namespace Std
 {
     namespace Allocator
@@ -460,11 +156,8 @@ namespace Std
     namespace BasicString
     {
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C
+        public unsafe partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator__C___N_std_S__String_val____N_std_S__Simple_types__C_Vb1 _Mypair;
-
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                 EntryPoint="??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ")]
@@ -497,19 +190,19 @@ namespace Std
             return new global::Std.BasicString<_Elem, _Traits, _Alloc>(native.ToPointer(), skipVTables);
         }
 
-        internal static global::Std.BasicString<_Elem, _Traits, _Alloc> __CreateInstance(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native, bool skipVTables = false)
+        internal static global::Std.BasicString<_Elem, _Traits, _Alloc> __CreateInstance(global::Std.BasicString.__Internal native, bool skipVTables = false)
         {
             return new global::Std.BasicString<_Elem, _Traits, _Alloc>(native, skipVTables);
         }
 
-        private static void* __CopyValue(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native)
+        private static void* __CopyValue(global::Std.BasicString.__Internal native)
         {
-            var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
-            *(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C*) ret = native;
+            var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internal));
+            *(global::Std.BasicString.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
-        private BasicString(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native, bool skipVTables = false)
+        private BasicString(global::Std.BasicString.__Internal native, bool skipVTables = false)
             : this(__CopyValue(native), skipVTables)
         {
             __ownsNativeInstance = true;
@@ -530,10 +223,10 @@ namespace Std
             var ___Alloc = typeof(_Alloc);
             if (___Elem.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Alloc.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
             {
-                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
+                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internal));
                 __ownsNativeInstance = true;
                 NativeToManagedMap[__Instance] = this;
-                global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.ctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment));
+                global::Std.BasicString.__Internal.ctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment));
                 return;
             }
             throw new ArgumentOutOfRangeException("_Elem, _Traits, _Alloc", string.Join(", ", new[] { typeof(_Elem).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_Elem, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
@@ -557,7 +250,7 @@ namespace Std
                 var ___Alloc = typeof(_Alloc);
                 if (___Elem.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Alloc.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
                 {
-                    global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.dtorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment), 0);
+                    global::Std.BasicString.__Internal.dtorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment), 0);
                     return;
                 }
                 throw new ArgumentOutOfRangeException("_Elem, _Traits, _Alloc", string.Join(", ", new[] { typeof(_Elem).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_Elem, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
@@ -580,39 +273,6 @@ namespace Std
         }
     }
 
-    namespace StringVal
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__String_val____N_std_S__Simple_types__C
-        {
-            [FieldOffset(0)]
-            internal global::Std.StringVal.Bxty.__Internal _Bx;
-
-            [FieldOffset(16)]
-            internal uint _Mysize;
-
-            [FieldOffset(20)]
-            internal uint _Myres;
-        }
-
-        namespace Bxty
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 16)]
-            public unsafe partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal fixed sbyte _Buf[16];
-
-                [FieldOffset(0)]
-                internal global::System.IntPtr _Ptr;
-
-                [FieldOffset(0)]
-                internal fixed sbyte _Alias[16];
-            }
-        }
-
-    }
-
     public unsafe static partial class BasicStringExtensions
     {
         [StructLayout(LayoutKind.Explicit, Size = 0)]
@@ -655,308 +315,8 @@ namespace Std
     namespace Vector
     {
         [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BlockContentComment___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_BlockContentComment___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_FunctionTemplateSpecialization___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_FunctionTemplateSpecialization___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_VFTableInfo___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_VFTableInfo___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_VTableComponent___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_VTableComponent___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutField___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_LayoutField___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutBase___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_LayoutBase___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration_S_Item___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Enumeration_S_Item___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ClassTemplateSpecialization___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_ClassTemplateSpecialization___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VarTemplateSpecialization___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_VarTemplateSpecialization___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_MacroDefinition___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_MacroDefinition___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TranslationUnit___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_TranslationUnit___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_InlineContentComment___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_InlineContentComment___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector__i___N_std_S_allocator__i
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator__i___N_std_S__Vector_val____N_std_S__Simple_types__i_Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VerbatimBlockLineComment___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_VerbatimBlockLineComment___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_InlineCommandComment_S_Argument___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_InlineCommandComment_S_Argument___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_S_ParserDiagnostic___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_S_ParserDiagnostic___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-    }
-
-    namespace VectorVal
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 12)]
-        public unsafe partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal global::System.IntPtr _Myfirst;
-
-            [FieldOffset(4)]
-            internal global::System.IntPtr _Mylast;
-
-            [FieldOffset(8)]
-            internal global::System.IntPtr _Myend;
-        }
-    }
-}
-
-namespace Std
-{
-    namespace TreeVal
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 8)]
         public unsafe partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal global::System.IntPtr _Myhead;
-
-            [FieldOffset(4)]
-            internal uint _Mysize;
         }
     }
 }
@@ -966,10 +326,8 @@ namespace Std
     namespace Map
     {
         [StructLayout(LayoutKind.Explicit, Size = 8)]
-        public unsafe partial struct __Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_
+        public unsafe partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_less____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S__Compressed_pair____N_std_S_allocator____N_std_S__Tree_node____N_std_S_pair__1S1_____N_CppSharp_N_CppParser_N_AST_S_Declaration__v___N_std_S__Tree_val____N_std_S__Tree_simple_types__S7__Vb1_Vb1 _Mypair;
         }
     }
 }
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
index 7ad9ef3e..d1ad4ee4 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
@@ -61,7 +61,7 @@ namespace CppSharp
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C fileName;
+                    internal global::Std.BasicString.__Internal fileName;
 
                     [FieldOffset(24)]
                     internal global::CppSharp.Parser.AST.ArchType archType;
@@ -633,7 +633,7 @@ namespace CppSharp
 
             public unsafe partial class InlineContentComment : global::CppSharp.Parser.AST.Comment, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -965,7 +965,7 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C text;
+                        internal global::Std.BasicString.__Internal text;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1520,7 +1520,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CommentKind kind;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1797,7 +1797,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_N___1_S_allocator__S0_ Arguments;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1969,7 +1969,7 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C text;
+                        internal global::Std.BasicString.__Internal text;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2205,7 +2205,7 @@ namespace CppSharp
 
             public unsafe partial class HTMLTagComment : global::CppSharp.Parser.AST.InlineContentComment, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -2308,7 +2308,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C tagName;
+                    internal global::Std.BasicString.__Internal tagName;
 
                     [FieldOffset(32)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_N___1_S_allocator__S0_ Attributes;
@@ -2355,10 +2355,10 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                        internal global::Std.BasicString.__Internal name;
 
                         [FieldOffset(24)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C value;
+                        internal global::Std.BasicString.__Internal value;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2610,7 +2610,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C tagName;
+                    internal global::Std.BasicString.__Internal tagName;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2724,7 +2724,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2835,10 +2835,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.RawCommentKind kind;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [FieldOffset(32)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C briefText;
+                    internal global::Std.BasicString.__Internal briefText;
 
                     [FieldOffset(56)]
                     internal global::System.IntPtr fullCommentBlock;
@@ -3299,7 +3299,7 @@ namespace CppSharp
 
             public unsafe partial class Type : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -3557,7 +3557,7 @@ namespace CppSharp
 
             public unsafe partial class QualifiedType : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 16)]
+                [StructLayout(LayoutKind.Explicit, Size = 11)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -3675,7 +3675,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.QualifiedType.__Internal*)__Instance)->qualifiers = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.TypeQualifiers.__Internal() : *(global::CppSharp.Parser.AST.TypeQualifiers.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.QualifiedType.__Internal*)__Instance)->qualifiers = *(global::CppSharp.Parser.AST.TypeQualifiers.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -3883,7 +3885,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ArrayType.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ArrayType.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4086,7 +4090,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.FunctionType.__Internal*)__Instance)->returnType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.FunctionType.__Internal*)__Instance)->returnType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4128,7 +4134,7 @@ namespace CppSharp
 
             public unsafe partial class PointerType : global::CppSharp.Parser.AST.Type, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 28)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -4225,7 +4231,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.PointerType.__Internal*)__Instance)->qualifiedPointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.PointerType.__Internal*)__Instance)->qualifiedPointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4331,7 +4339,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.MemberPointerType.__Internal*)__Instance)->pointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.MemberPointerType.__Internal*)__Instance)->pointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4525,7 +4535,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->modified = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->modified = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4538,7 +4550,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->equivalent = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->equivalent = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4637,7 +4651,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->decayed = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->decayed = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4650,7 +4666,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->original = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->original = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4663,7 +4681,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->pointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->pointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4801,7 +4821,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateArgument.__Internal*)__Instance)->type = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateArgument.__Internal*)__Instance)->type = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5007,7 +5029,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateSpecializationType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateSpecializationType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5170,7 +5194,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DependentTemplateSpecializationType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DependentTemplateSpecializationType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5186,7 +5212,7 @@ namespace CppSharp
 
             public unsafe partial class TemplateParameterType : global::CppSharp.Parser.AST.Type, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 25)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -5439,7 +5465,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateParameterSubstitutionType.__Internal*)__Instance)->replacement = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateParameterSubstitutionType.__Internal*)__Instance)->replacement = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5553,7 +5581,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.InjectedClassNameType.__Internal*)__Instance)->injectedSpecializationType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.InjectedClassNameType.__Internal*)__Instance)->injectedSpecializationType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5591,7 +5621,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifier;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C identifier;
+                    internal global::Std.BasicString.__Internal identifier;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -5685,7 +5715,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DependentNameType.__Internal*)__Instance)->qualifier = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DependentNameType.__Internal*)__Instance)->qualifier = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5708,7 +5740,7 @@ namespace CppSharp
 
             public unsafe partial class PackExpansionType : global::CppSharp.Parser.AST.Type, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -5874,7 +5906,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5887,14 +5921,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class VectorType : global::CppSharp.Parser.AST.Type, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 28)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -5983,7 +6019,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.VectorType.__Internal*)__Instance)->elementType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.VectorType.__Internal*)__Instance)->elementType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -6316,13 +6354,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -6818,7 +6856,7 @@ namespace CppSharp
 
             public unsafe partial class DeclarationContext : global::CppSharp.Parser.AST.Declaration, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 448)]
+                [StructLayout(LayoutKind.Explicit, Size = 441)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -6843,13 +6881,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -6909,7 +6947,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(416)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(440)]
                     internal byte isAnonymous;
@@ -7520,13 +7558,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -7658,7 +7696,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TypedefNameDecl.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TypedefNameDecl.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -7690,13 +7730,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -7842,13 +7882,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -8015,13 +8055,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -8170,7 +8210,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8329,7 +8369,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8432,7 +8472,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(40)]
                     internal global::System.IntPtr LHS;
@@ -8441,7 +8481,7 @@ namespace CppSharp
                     internal global::System.IntPtr RHS;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8601,7 +8641,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(40)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_N___1_S_allocator__S0_ Arguments;
@@ -8760,7 +8800,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(40)]
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_N___1_S_allocator__S0_ Arguments;
@@ -8934,13 +8974,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -9082,7 +9122,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Parameter.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Parameter.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9189,13 +9231,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -9255,7 +9297,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(416)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(440)]
                     internal byte isAnonymous;
@@ -9294,13 +9336,13 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CXXOperatorKind operatorKind;
 
                     [FieldOffset(480)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(504)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C signature;
+                    internal global::Std.BasicString.__Internal signature;
 
                     [FieldOffset(528)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C body;
+                    internal global::Std.BasicString.__Internal body;
 
                     [FieldOffset(552)]
                     internal global::System.IntPtr bodyStmt;
@@ -9456,7 +9498,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->returnType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->returnType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9714,7 +9758,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9755,13 +9801,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -9821,7 +9867,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(416)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(440)]
                     internal byte isAnonymous;
@@ -9860,13 +9906,13 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CXXOperatorKind operatorKind;
 
                     [FieldOffset(480)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(504)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C signature;
+                    internal global::Std.BasicString.__Internal signature;
 
                     [FieldOffset(528)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C body;
+                    internal global::Std.BasicString.__Internal body;
 
                     [FieldOffset(552)]
                     internal global::System.IntPtr bodyStmt;
@@ -10159,7 +10205,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Method.__Internal*)__Instance)->conversionType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Method.__Internal*)__Instance)->conversionType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -10213,13 +10261,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -10279,7 +10327,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(416)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(440)]
                     internal byte isAnonymous;
@@ -10372,13 +10420,13 @@ namespace CppSharp
                         internal int lineNumberEnd;
 
                         [FieldOffset(40)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                        internal global::Std.BasicString.__Internal name;
 
                         [FieldOffset(64)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                        internal global::Std.BasicString.__Internal USR;
 
                         [FieldOffset(88)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                        internal global::Std.BasicString.__Internal debugText;
 
                         [FieldOffset(112)]
                         internal byte isIncomplete;
@@ -10411,7 +10459,7 @@ namespace CppSharp
                         internal global::System.IntPtr comment;
 
                         [FieldOffset(200)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C expression;
+                        internal global::Std.BasicString.__Internal expression;
 
                         [FieldOffset(224)]
                         internal ulong value;
@@ -10721,13 +10769,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -10760,7 +10808,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(200)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(224)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -10873,14 +10921,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Variable.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Variable.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class BaseClassSpecifier : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 20)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -11062,13 +11112,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -11204,7 +11254,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Field.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Field.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -11280,13 +11332,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -11849,7 +11901,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.VFTableInfo.__Internal*)__Instance)->layout = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.VTableLayout.__Internal() : *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.VFTableInfo.__Internal*)__Instance)->layout = *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -11863,7 +11917,7 @@ namespace CppSharp
                     internal uint offset;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -12001,7 +12055,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.LayoutField.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.LayoutField.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -12439,7 +12495,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ClassLayout.__Internal*)__Instance)->layout = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.VTableLayout.__Internal() : *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ClassLayout.__Internal*)__Instance)->layout = *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
                     }
                 }
 
@@ -12563,13 +12621,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -12629,7 +12687,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(416)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(440)]
                     internal byte isAnonymous;
@@ -13150,13 +13208,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -13395,13 +13453,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -13525,7 +13583,7 @@ namespace CppSharp
 
             public unsafe partial class TemplateParameter : global::CppSharp.Parser.AST.Declaration, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 216)]
+                [StructLayout(LayoutKind.Explicit, Size = 209)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -13550,13 +13608,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -13727,7 +13785,7 @@ namespace CppSharp
 
             public unsafe partial class TemplateTemplateParameter : global::CppSharp.Parser.AST.Template, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 240)]
+                [StructLayout(LayoutKind.Explicit, Size = 235)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -13752,13 +13810,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -13955,13 +14013,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -14097,14 +14155,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TypeTemplateParameter.__Internal*)__Instance)->defaultArgument = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TypeTemplateParameter.__Internal*)__Instance)->defaultArgument = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class NonTypeTemplateParameter : global::CppSharp.Parser.AST.TemplateParameter, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 240)]
+                [StructLayout(LayoutKind.Explicit, Size = 238)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -14129,13 +14189,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -14377,13 +14437,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -14603,7 +14663,7 @@ namespace CppSharp
 
             public unsafe partial class ClassTemplateSpecialization : global::CppSharp.Parser.AST.Class, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 608)]
+                [StructLayout(LayoutKind.Explicit, Size = 604)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -14628,13 +14688,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -14694,7 +14754,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(416)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(440)]
                     internal byte isAnonymous;
@@ -14919,7 +14979,7 @@ namespace CppSharp
 
             public unsafe partial class ClassTemplatePartialSpecialization : global::CppSharp.Parser.AST.ClassTemplateSpecialization, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 608)]
+                [StructLayout(LayoutKind.Explicit, Size = 604)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -14944,13 +15004,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -15010,7 +15070,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(416)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(440)]
                     internal byte isAnonymous;
@@ -15180,13 +15240,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -15386,7 +15446,7 @@ namespace CppSharp
 
             public unsafe partial class FunctionTemplateSpecialization : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 44)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -15619,13 +15679,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -15845,7 +15905,7 @@ namespace CppSharp
 
             public unsafe partial class VarTemplateSpecialization : global::CppSharp.Parser.AST.Variable, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 280)]
+                [StructLayout(LayoutKind.Explicit, Size = 276)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -15870,13 +15930,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -15909,7 +15969,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(200)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(224)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -16089,7 +16149,7 @@ namespace CppSharp
 
             public unsafe partial class VarTemplatePartialSpecialization : global::CppSharp.Parser.AST.VarTemplateSpecialization, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 280)]
+                [StructLayout(LayoutKind.Explicit, Size = 276)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -16114,13 +16174,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -16153,7 +16213,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(200)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(224)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -16253,7 +16313,7 @@ namespace CppSharp
 
             public unsafe partial class Namespace : global::CppSharp.Parser.AST.DeclarationContext, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 448)]
+                [StructLayout(LayoutKind.Explicit, Size = 442)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -16278,13 +16338,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -16344,7 +16404,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(416)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(440)]
                     internal byte isAnonymous;
@@ -16451,7 +16511,7 @@ namespace CppSharp
 
             public unsafe partial class PreprocessedEntity : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 20)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -16600,10 +16660,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.DeclarationKind kind;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C expression;
+                    internal global::Std.BasicString.__Internal expression;
 
                     [FieldOffset(72)]
                     internal int lineNumberStart;
@@ -16768,10 +16828,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.DeclarationKind kind;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [FieldOffset(72)]
                     internal global::System.IntPtr definition;
@@ -16937,13 +16997,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(112)]
                     internal byte isIncomplete;
@@ -17003,7 +17063,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_ Friends;
 
                     [FieldOffset(416)]
-                    internal global::Std.Map.__Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(440)]
                     internal byte isAnonymous;
@@ -17012,7 +17072,7 @@ namespace CppSharp
                     internal byte isInline;
 
                     [FieldOffset(448)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C fileName;
+                    internal global::Std.BasicString.__Internal fileName;
 
                     [FieldOffset(472)]
                     internal byte isSystemHeader;
@@ -17212,7 +17272,7 @@ namespace CppSharp
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                         EntryPoint="_ZN8CppSharp9CppParser3AST10ASTContext18FindOrCreateModuleENSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE")]
-                    internal static extern global::System.IntPtr FindOrCreateModule(global::System.IntPtr __instance, global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C File);
+                    internal static extern global::System.IntPtr FindOrCreateModule(global::System.IntPtr __instance, global::System.IntPtr File);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -17315,9 +17375,8 @@ namespace CppSharp
                 {
                     var __basicString0 = new global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>();
                     global::Std.BasicStringExtensions.Assign(__basicString0, File);
-                    var __arg0 = *(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C*) __basicString0.__Instance;
+                    var __arg0 = __basicString0.__Instance;
                     var __ret = __Internal.FindOrCreateModule((__Instance + __PointerAdjustment), __arg0);
-                    __basicString0.Dispose(false);
                     global::CppSharp.Parser.AST.TranslationUnit __result0;
                     if (__ret == IntPtr.Zero) __result0 = null;
                     else if (global::CppSharp.Parser.AST.TranslationUnit.NativeToManagedMap.ContainsKey(__ret))
@@ -17638,7 +17697,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->sourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->sourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -17865,7 +17926,7 @@ namespace CppSharp
 
             public unsafe partial class NullStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 28)]
+                [StructLayout(LayoutKind.Explicit, Size = 25)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -18392,7 +18453,7 @@ namespace CppSharp
 
             public unsafe partial class CaseStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 65)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -18571,7 +18632,7 @@ namespace CppSharp
 
             public unsafe partial class DefaultStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 44)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -18926,7 +18987,7 @@ namespace CppSharp
 
             public unsafe partial class IfStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 81)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -19223,7 +19284,7 @@ namespace CppSharp
 
             public unsafe partial class SwitchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 65)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -19626,7 +19687,7 @@ namespace CppSharp
 
             public unsafe partial class DoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 52)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -20466,7 +20527,7 @@ namespace CppSharp
 
             public unsafe partial class ReturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -20927,7 +20988,7 @@ namespace CppSharp
 
             public unsafe partial class GCCAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -20990,7 +21051,7 @@ namespace CppSharp
 
                 public unsafe partial class AsmStringPiece : IDisposable
                 {
-                    [StructLayout(LayoutKind.Explicit, Size = 40)]
+                    [StructLayout(LayoutKind.Explicit, Size = 37)]
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
@@ -21000,7 +21061,7 @@ namespace CppSharp
                         internal byte isOperand;
 
                         [FieldOffset(8)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
+                        internal global::Std.BasicString.__Internal @string;
 
                         [FieldOffset(32)]
                         internal uint operandNo;
@@ -21310,7 +21371,7 @@ namespace CppSharp
                     internal uint numAsmToks;
 
                     [FieldOffset(112)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C asmString;
+                    internal global::Std.BasicString.__Internal asmString;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -22000,7 +22061,7 @@ namespace CppSharp
 
             public unsafe partial class CapturedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -22494,7 +22555,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXCatchStmt.__Internal*)__Instance)->caughtType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXCatchStmt.__Internal*)__Instance)->caughtType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -22519,7 +22582,7 @@ namespace CppSharp
 
             public unsafe partial class CXXTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -23941,7 +24004,7 @@ namespace CppSharp
 
             public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -24080,7 +24143,7 @@ namespace CppSharp
 
                 public unsafe partial class Classification : IDisposable
                 {
-                    [StructLayout(LayoutKind.Explicit, Size = 16)]
+                    [StructLayout(LayoutKind.Explicit, Size = 14)]
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
@@ -24399,7 +24462,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Expr.__Internal*)__Instance)->type = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Expr.__Internal*)__Instance)->type = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -25047,7 +25112,7 @@ namespace CppSharp
 
             public unsafe partial class DeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 121)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -26166,7 +26231,7 @@ namespace CppSharp
 
             public unsafe partial class StringLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 160)]
+                [StructLayout(LayoutKind.Explicit, Size = 156)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -26224,10 +26289,10 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(80)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C bytes;
+                    internal global::Std.BasicString.__Internal bytes;
 
                     [FieldOffset(128)]
                     internal uint byteLength;
@@ -26564,7 +26629,7 @@ namespace CppSharp
 
             public unsafe partial class PredefinedExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -26905,7 +26970,7 @@ namespace CppSharp
 
             public unsafe partial class UnaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 99)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -27192,7 +27257,7 @@ namespace CppSharp
 
             public unsafe partial class OffsetOfExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -27579,7 +27644,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->argumentType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->argumentType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -27610,7 +27677,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->typeOfArgument = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->typeOfArgument = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -27839,7 +27908,7 @@ namespace CppSharp
 
             public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 149)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -28200,7 +28269,7 @@ namespace CppSharp
 
             public unsafe partial class MemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 125)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -28978,7 +29047,7 @@ namespace CppSharp
 
             public unsafe partial class ImplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 121)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -29313,7 +29382,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*)__Instance)->typeAsWritten = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*)__Instance)->typeAsWritten = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -29498,7 +29569,7 @@ namespace CppSharp
 
             public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 144)]
+                [StructLayout(LayoutKind.Explicit, Size = 142)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -29568,7 +29639,7 @@ namespace CppSharp
                     internal global::System.IntPtr rHS;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [FieldOffset(128)]
                     internal byte isPtrMemOp;
@@ -30047,7 +30118,7 @@ namespace CppSharp
                     internal global::System.IntPtr rHS;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [FieldOffset(128)]
                     internal byte isPtrMemOp;
@@ -30189,7 +30260,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationLHSType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationLHSType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -30202,7 +30275,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationResultType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationResultType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -30803,7 +30878,7 @@ namespace CppSharp
 
             public unsafe partial class AddrLabelExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -31885,7 +31960,7 @@ namespace CppSharp
 
             public unsafe partial class VAArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -32076,7 +32151,7 @@ namespace CppSharp
 
             public unsafe partial class InitListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 129)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -32405,7 +32480,7 @@ namespace CppSharp
 
             public unsafe partial class DesignatedInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 108)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -32493,7 +32568,7 @@ namespace CppSharp
 
                 public unsafe partial class Designator : IDisposable
                 {
-                    [StructLayout(LayoutKind.Explicit, Size = 48)]
+                    [StructLayout(LayoutKind.Explicit, Size = 44)]
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
@@ -32755,7 +32830,9 @@ namespace CppSharp
 
                         set
                         {
-                            ((global::CppSharp.Parser.AST.DesignatedInitExpr.Designator.__Internal*)__Instance)->sourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                            if (ReferenceEquals(value, null))
+                                throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                            ((global::CppSharp.Parser.AST.DesignatedInitExpr.Designator.__Internal*)__Instance)->sourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                         }
                     }
                 }
@@ -33066,14 +33143,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DesignatedInitExpr.__Internal*)__Instance)->designatorsSourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DesignatedInitExpr.__Internal*)__Instance)->designatorsSourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class NoInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -33523,7 +33602,7 @@ namespace CppSharp
 
             public unsafe partial class ArrayInitIndexExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -33645,7 +33724,7 @@ namespace CppSharp
 
             public unsafe partial class ImplicitValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -34197,7 +34276,7 @@ namespace CppSharp
 
             public unsafe partial class ExtVectorElementExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 98)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -34738,7 +34817,7 @@ namespace CppSharp
 
             public unsafe partial class PseudoObjectExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 108)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -34934,7 +35013,7 @@ namespace CppSharp
 
             public unsafe partial class AtomicExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 172)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -35283,7 +35362,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AtomicExpr.__Internal*)__Instance)->valueType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AtomicExpr.__Internal*)__Instance)->valueType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -35381,7 +35462,7 @@ namespace CppSharp
 
             public unsafe partial class TypoExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -35503,7 +35584,7 @@ namespace CppSharp
 
             public unsafe partial class CXXOperatorCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 165)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -36378,7 +36459,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*)__Instance)->angleBrackets = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*)__Instance)->angleBrackets = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -36543,7 +36626,7 @@ namespace CppSharp
 
             public unsafe partial class CXXDynamicCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 161)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -37033,7 +37116,7 @@ namespace CppSharp
 
             public unsafe partial class UserDefinedLiteral : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 172)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -37701,7 +37784,7 @@ namespace CppSharp
 
             public unsafe partial class CXXTypeidExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 90)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38247,7 +38330,7 @@ namespace CppSharp
 
             public unsafe partial class CXXUuidofExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 120)]
+                [StructLayout(LayoutKind.Explicit, Size = 113)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38308,7 +38391,7 @@ namespace CppSharp
                     internal global::System.IntPtr exprOperand;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C uuidStr;
+                    internal global::Std.BasicString.__Internal uuidStr;
 
                     [FieldOffset(112)]
                     internal byte isTypeOperand;
@@ -38446,7 +38529,7 @@ namespace CppSharp
 
             public unsafe partial class CXXThisExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 81)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38600,7 +38683,7 @@ namespace CppSharp
 
             public unsafe partial class CXXThrowExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 93)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38775,7 +38858,7 @@ namespace CppSharp
 
             public unsafe partial class CXXDefaultArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -39566,7 +39649,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXConstructExpr.__Internal*)__Instance)->parenOrBraceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXConstructExpr.__Internal*)__Instance)->parenOrBraceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -39765,7 +39850,7 @@ namespace CppSharp
 
             public unsafe partial class CXXFunctionalCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 145)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -40129,7 +40214,7 @@ namespace CppSharp
 
             public unsafe partial class LambdaExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 147)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -40378,7 +40463,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.LambdaExpr.__Internal*)__Instance)->introducerRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.LambdaExpr.__Internal*)__Instance)->introducerRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -40901,7 +40988,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->allocatedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->allocatedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -40971,7 +41060,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->typeIdParens = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->typeIdParens = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41059,7 +41150,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->directInitRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->directInitRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41296,14 +41389,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXDeleteExpr.__Internal*)__Instance)->destroyedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXDeleteExpr.__Internal*)__Instance)->destroyedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class CXXPseudoDestructorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 124)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -41538,7 +41633,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXPseudoDestructorExpr.__Internal*)__Instance)->destroyedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXPseudoDestructorExpr.__Internal*)__Instance)->destroyedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41849,7 +41946,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ArrayTypeTraitExpr.__Internal*)__Instance)->queriedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ArrayTypeTraitExpr.__Internal*)__Instance)->queriedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41887,7 +41986,7 @@ namespace CppSharp
 
             public unsafe partial class ExpressionTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 89)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -42403,7 +42502,7 @@ namespace CppSharp
 
             public unsafe partial class UnresolvedLookupExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 106)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -42581,7 +42680,7 @@ namespace CppSharp
 
             public unsafe partial class DependentScopeDeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -42815,7 +42914,7 @@ namespace CppSharp
 
             public unsafe partial class ExprWithCleanups : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 93)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -43209,7 +43308,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXUnresolvedConstructExpr.__Internal*)__Instance)->typeAsWritten = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXUnresolvedConstructExpr.__Internal*)__Instance)->typeAsWritten = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43449,7 +43550,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXDependentScopeMemberExpr.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXDependentScopeMemberExpr.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43591,7 +43694,7 @@ namespace CppSharp
 
             public unsafe partial class UnresolvedMemberExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 148)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -43795,7 +43898,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnresolvedMemberExpr.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnresolvedMemberExpr.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43854,7 +43959,7 @@ namespace CppSharp
 
             public unsafe partial class CXXNoexceptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 89)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -44013,7 +44118,7 @@ namespace CppSharp
 
             public unsafe partial class PackExpansionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -44172,7 +44277,7 @@ namespace CppSharp
 
             public unsafe partial class SizeOfPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 101)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -44701,14 +44806,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.SubstNonTypeTemplateParmPackExpr.__Internal*)__Instance)->argumentPack = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.TemplateArgument.__Internal() : *(global::CppSharp.Parser.AST.TemplateArgument.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.SubstNonTypeTemplateParmPackExpr.__Internal*)__Instance)->argumentPack = *(global::CppSharp.Parser.AST.TemplateArgument.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class FunctionParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -44862,7 +44969,7 @@ namespace CppSharp
 
             public unsafe partial class MaterializeTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 101)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -45864,7 +45971,7 @@ namespace CppSharp
 
             public unsafe partial class DependentCoawaitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -46231,7 +46338,7 @@ namespace CppSharp
             public partial struct __Internal
             {
                 [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C ABI;
+                internal global::Std.BasicString.__Internal ABI;
 
                 [FieldOffset(24)]
                 internal global::CppSharp.Parser.ParserIntType char16Type;
@@ -47069,7 +47176,7 @@ namespace CppSharp
                 internal global::Std.Vector.__Internalc__N_std_N___1_S_vector____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C___N_std_N___1_S_allocator__S0_ Arguments;
 
                 [FieldOffset(24)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C libraryFile;
+                internal global::Std.BasicString.__Internal libraryFile;
 
                 [FieldOffset(48)]
                 internal global::Std.Vector.__Internalc__N_std_N___1_S_vector____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C___N_std_N___1_S_allocator__S0_ SourceFiles;
@@ -47099,10 +47206,10 @@ namespace CppSharp
                 internal int toolSetToUse;
 
                 [FieldOffset(232)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C targetTriple;
+                internal global::Std.BasicString.__Internal targetTriple;
 
                 [FieldOffset(256)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C currentDir;
+                internal global::Std.BasicString.__Internal currentDir;
 
                 [FieldOffset(280)]
                 internal byte noStandardIncludes;
@@ -47766,14 +47873,14 @@ namespace CppSharp
 
         public unsafe partial class ParserDiagnostic : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 64)]
+            [StructLayout(LayoutKind.Explicit, Size = 60)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C fileName;
+                internal global::Std.BasicString.__Internal fileName;
 
                 [FieldOffset(24)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C message;
+                internal global::Std.BasicString.__Internal message;
 
                 [FieldOffset(48)]
                 internal global::CppSharp.Parser.ParserDiagnosticLevel level;
@@ -48179,7 +48286,7 @@ namespace CppSharp
 
         public unsafe partial class ClangParser : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 0)]
+            [StructLayout(LayoutKind.Explicit, Size = 1)]
             public partial struct __Internal
             {
                 [SuppressUnmanagedCodeSecurity]
@@ -48299,23 +48406,13 @@ namespace Std
 {
     namespace __1
     {
-        namespace Pair
+        namespace pair
         {
-            [StructLayout(LayoutKind.Explicit, Size = 32)]
-            public unsafe partial struct __Internalc__N_std_N___1_S_pair____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration
-            {
-                [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C first;
-
-                [FieldOffset(24)]
-                internal global::System.IntPtr second;
-            }
-
             [StructLayout(LayoutKind.Explicit, Size = 32)]
             public unsafe partial struct __Internalc__N_std_N___1_S_pair__1__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration
             {
                 [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C first;
+                internal global::Std.BasicString.__Internal first;
 
                 [FieldOffset(24)]
                 internal global::System.IntPtr second;
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs
index 54ee41f1..60330b85 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs
@@ -35,16 +35,6 @@ namespace Std
 
 namespace Std
 {
-    namespace CompressedPair
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal global::Std.BasicString.Rep.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C __first_;
-        }
-    }
-
     namespace Allocator
     {
         [StructLayout(LayoutKind.Explicit, Size = 0)]
@@ -110,6 +100,14 @@ namespace Std
             __Instance = IntPtr.Zero;
         }
     }
+
+    namespace CompressedPair
+    {
+        [StructLayout(LayoutKind.Explicit, Size = 8)]
+        public unsafe partial struct __Internal
+        {
+        }
+    }
 }
 
 namespace Std
@@ -117,7 +115,7 @@ namespace Std
     namespace Vector
     {
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BlockContentComment___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -130,7 +128,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_FunctionTemplateSpecialization___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -143,7 +141,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ClassTemplateSpecialization___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BlockContentComment___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -156,7 +154,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VarTemplateSpecialization___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -169,7 +167,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_MacroDefinition___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -182,7 +180,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TranslationUnit___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -195,7 +193,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -208,7 +206,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -221,7 +219,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_InlineContentComment___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -234,7 +232,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -247,7 +245,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector__i___N_std_N___1_S_allocator__i
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -260,7 +258,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VerbatimBlockLineComment___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -273,7 +271,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_InlineCommandComment_S_Argument___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -286,7 +284,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -299,7 +297,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_S_ParserDiagnostic___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -312,7 +310,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -325,7 +323,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_FunctionTemplateSpecialization___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -338,7 +336,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -351,7 +349,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -364,7 +362,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_VFTableInfo___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -377,7 +375,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_VTableComponent___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -390,7 +388,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutField___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -403,7 +401,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutBase___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -416,7 +414,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration_S_Item___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -429,20 +427,20 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
-            internal global::System.IntPtr __begin_;
+            internal global::Std.BasicString.__Internal __begin_;
 
             [FieldOffset(8)]
-            internal global::System.IntPtr __end_;
+            internal global::Std.BasicString.__Internal __end_;
 
             [FieldOffset(16)]
             internal global::Std.CompressedPair.__Internal __end_cap_;
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ClassTemplateSpecialization___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -455,7 +453,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -468,7 +466,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VarTemplateSpecialization___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -481,7 +479,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_MacroDefinition___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -494,7 +492,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TranslationUnit___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -507,7 +505,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -520,7 +518,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -533,7 +531,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_VFTableInfo___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_InlineContentComment___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -546,7 +544,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_VTableComponent___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -559,7 +557,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutField___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector__i___N_std_N___1_S_allocator__i
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -572,7 +570,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutBase___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VerbatimBlockLineComment___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -585,7 +583,7 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration_S_Item___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_InlineCommandComment_S_Argument___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -598,20 +596,20 @@ namespace Std
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
-            internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C __begin_;
+            internal global::System.IntPtr __begin_;
 
             [FieldOffset(8)]
-            internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C __end_;
+            internal global::System.IntPtr __end_;
 
             [FieldOffset(16)]
             internal global::Std.CompressedPair.__Internal __end_cap_;
         }
 
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_N___1_S_allocator__S0_
+        public unsafe partial struct __Internalc__N_std_N___1_S_vector____N_CppSharp_N_CppParser_S_ParserDiagnostic___N_std_N___1_S_allocator__S0_
         {
             [FieldOffset(0)]
             internal global::System.IntPtr __begin_;
@@ -627,31 +625,6 @@ namespace Std
 
 namespace Std
 {
-    namespace Tree
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S___tree____N_std_N___1_U___value_type____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S___map_value_compare__S1__S0____N_std_N___1_S_less__S1__Vb1___N_std_N___1_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::System.IntPtr __begin_node_;
-
-            [FieldOffset(8)]
-            internal global::Std.CompressedPair.__Internal __pair1_;
-
-            [FieldOffset(16)]
-            internal global::Std.CompressedPair.__Internal __pair3_;
-        }
-    }
-
-    namespace TreeEndNode
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 8)]
-        public unsafe partial struct __Internal_Ptr
-        {
-            [FieldOffset(0)]
-            internal global::System.IntPtr __left_;
-        }
-    }
 }
 
 namespace Std
@@ -659,10 +632,8 @@ namespace Std
     namespace Map
     {
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_map____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S_less__S0____N_std_N___1_S_allocator____N_std_N___1_S_pair__1S0__S3_
+        public unsafe partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal global::Std.Tree.__Internalc__N_std_N___1_S___tree____N_std_N___1_U___value_type____N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_N___1_S___map_value_compare__S1__S0____N_std_N___1_S_less__S1__Vb1___N_std_N___1_S_allocator__S0_ __tree_;
         }
     }
 }
@@ -672,11 +643,8 @@ namespace Std
     namespace BasicString
     {
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
+        public unsafe partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internal __r_;
-
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                 EntryPoint="_ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2Ev")]
@@ -692,90 +660,6 @@ namespace Std
                 EntryPoint="_ZNKSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5c_strEv")]
             internal static extern global::System.IntPtr CStrc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C(global::System.IntPtr __instance);
         }
-
-        namespace Rep
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 24)]
-            public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
-            {
-                [FieldOffset(0)]
-                internal global::Std.BasicString.Rep._4.__Internal _0;
-            }
-
-            namespace _4
-            {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
-                public unsafe partial struct __Internal
-                {
-                    [FieldOffset(0)]
-                    internal global::Std.BasicString.Long.__Internal __l;
-
-                    [FieldOffset(0)]
-                    internal global::Std.BasicString.Short.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C __s;
-
-                    [FieldOffset(0)]
-                    internal global::Std.BasicString.Raw.__Internal __r;
-                }
-
-            }
-
-        }
-
-        namespace Long
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 24)]
-            public unsafe partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal ulong __cap_;
-
-                [FieldOffset(8)]
-                internal ulong __size_;
-
-                [FieldOffset(16)]
-                internal global::System.IntPtr __data_;
-            }
-
-        }
-
-        namespace Short
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 24)]
-            public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
-            {
-                [FieldOffset(0)]
-                internal global::Std.BasicString.Short._4.__Internal _0;
-
-                [FieldOffset(1)]
-                internal fixed sbyte __data_[23];
-            }
-
-            namespace _4
-            {
-                [StructLayout(LayoutKind.Explicit, Size = 1)]
-                public unsafe partial struct __Internal
-                {
-                    [FieldOffset(0)]
-                    internal byte __size_;
-
-                    [FieldOffset(0)]
-                    internal sbyte __lx;
-                }
-
-            }
-
-        }
-
-        namespace Raw
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 24)]
-            public unsafe partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal fixed ulong __words[3];
-            }
-        }
-
     }
 
     public unsafe partial class BasicString<_CharT, _Traits, _Allocator> : IDisposable
@@ -793,19 +677,19 @@ namespace Std
             return new global::Std.BasicString<_CharT, _Traits, _Allocator>(native.ToPointer(), skipVTables);
         }
 
-        internal static global::Std.BasicString<_CharT, _Traits, _Allocator> __CreateInstance(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C native, bool skipVTables = false)
+        internal static global::Std.BasicString<_CharT, _Traits, _Allocator> __CreateInstance(global::Std.BasicString.__Internal native, bool skipVTables = false)
         {
             return new global::Std.BasicString<_CharT, _Traits, _Allocator>(native, skipVTables);
         }
 
-        private static void* __CopyValue(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C native)
+        private static void* __CopyValue(global::Std.BasicString.__Internal native)
         {
-            var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C));
-            *(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C*) ret = native;
+            var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internal));
+            *(global::Std.BasicString.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
-        private BasicString(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C native, bool skipVTables = false)
+        private BasicString(global::Std.BasicString.__Internal native, bool skipVTables = false)
             : this(__CopyValue(native), skipVTables)
         {
             __ownsNativeInstance = true;
@@ -826,10 +710,10 @@ namespace Std
             var ___Allocator = typeof(_Allocator);
             if (___CharT.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Allocator.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
             {
-                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C));
+                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internal));
                 __ownsNativeInstance = true;
                 NativeToManagedMap[__Instance] = this;
-                global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C.ctorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C((__Instance + __PointerAdjustment));
+                global::Std.BasicString.__Internal.ctorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C((__Instance + __PointerAdjustment));
                 return;
             }
             throw new ArgumentOutOfRangeException("_CharT, _Traits, _Allocator", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Allocator).FullName }), "global::Std.BasicString<_CharT, _Traits, _Allocator> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
@@ -853,7 +737,7 @@ namespace Std
                 var ___Allocator = typeof(_Allocator);
                 if (___CharT.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Allocator.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
                 {
-                    global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C.dtorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C((__Instance + __PointerAdjustment));
+                    global::Std.BasicString.__Internal.dtorc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C((__Instance + __PointerAdjustment));
                     return;
                 }
                 throw new ArgumentOutOfRangeException("_CharT, _Traits, _Allocator", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Allocator).FullName }), "global::Std.BasicString<_CharT, _Traits, _Allocator> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
@@ -878,7 +762,7 @@ namespace Std
 
     namespace CharTraits
     {
-        [StructLayout(LayoutKind.Explicit, Size = 0)]
+        [StructLayout(LayoutKind.Explicit, Size = 1)]
         public unsafe partial struct __Internal
         {
         }
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
index 85b84110..c2311064 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
@@ -61,7 +61,7 @@ namespace CppSharp
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C fileName;
+                    internal global::Std.BasicString.__Internal fileName;
 
                     [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.ArchType archType;
@@ -633,7 +633,7 @@ namespace CppSharp
 
             public unsafe partial class InlineContentComment : global::CppSharp.Parser.AST.Comment, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -965,7 +965,7 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                        internal global::Std.BasicString.__Internal text;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1520,7 +1520,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CommentKind kind;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1797,7 +1797,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S_allocator__S0_ Arguments;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1969,7 +1969,7 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                        internal global::Std.BasicString.__Internal text;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2205,7 +2205,7 @@ namespace CppSharp
 
             public unsafe partial class HTMLTagComment : global::CppSharp.Parser.AST.InlineContentComment, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -2308,7 +2308,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C tagName;
+                    internal global::Std.BasicString.__Internal tagName;
 
                     [FieldOffset(40)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_S_allocator__S0_ Attributes;
@@ -2355,10 +2355,10 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                        internal global::Std.BasicString.__Internal name;
 
                         [FieldOffset(32)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C value;
+                        internal global::Std.BasicString.__Internal value;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2610,7 +2610,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C tagName;
+                    internal global::Std.BasicString.__Internal tagName;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2724,7 +2724,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2835,10 +2835,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.RawCommentKind kind;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C briefText;
+                    internal global::Std.BasicString.__Internal briefText;
 
                     [FieldOffset(72)]
                     internal global::System.IntPtr fullCommentBlock;
@@ -3299,7 +3299,7 @@ namespace CppSharp
 
             public unsafe partial class Type : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -3557,7 +3557,7 @@ namespace CppSharp
 
             public unsafe partial class QualifiedType : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 16)]
+                [StructLayout(LayoutKind.Explicit, Size = 11)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -3675,7 +3675,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.QualifiedType.__Internal*)__Instance)->qualifiers = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.TypeQualifiers.__Internal() : *(global::CppSharp.Parser.AST.TypeQualifiers.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.QualifiedType.__Internal*)__Instance)->qualifiers = *(global::CppSharp.Parser.AST.TypeQualifiers.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -3883,7 +3885,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ArrayType.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ArrayType.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4086,7 +4090,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.FunctionType.__Internal*)__Instance)->returnType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.FunctionType.__Internal*)__Instance)->returnType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4128,7 +4134,7 @@ namespace CppSharp
 
             public unsafe partial class PointerType : global::CppSharp.Parser.AST.Type, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 28)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -4225,7 +4231,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.PointerType.__Internal*)__Instance)->qualifiedPointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.PointerType.__Internal*)__Instance)->qualifiedPointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4331,7 +4339,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.MemberPointerType.__Internal*)__Instance)->pointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.MemberPointerType.__Internal*)__Instance)->pointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4525,7 +4535,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->modified = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->modified = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4538,7 +4550,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->equivalent = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->equivalent = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4637,7 +4651,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->decayed = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->decayed = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4650,7 +4666,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->original = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->original = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4663,7 +4681,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->pointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->pointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4801,7 +4821,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateArgument.__Internal*)__Instance)->type = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateArgument.__Internal*)__Instance)->type = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5007,7 +5029,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateSpecializationType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateSpecializationType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5170,7 +5194,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DependentTemplateSpecializationType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DependentTemplateSpecializationType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5186,7 +5212,7 @@ namespace CppSharp
 
             public unsafe partial class TemplateParameterType : global::CppSharp.Parser.AST.Type, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 25)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -5439,7 +5465,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateParameterSubstitutionType.__Internal*)__Instance)->replacement = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateParameterSubstitutionType.__Internal*)__Instance)->replacement = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5553,7 +5581,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.InjectedClassNameType.__Internal*)__Instance)->injectedSpecializationType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.InjectedClassNameType.__Internal*)__Instance)->injectedSpecializationType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5591,7 +5621,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifier;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C identifier;
+                    internal global::Std.BasicString.__Internal identifier;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -5685,7 +5715,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DependentNameType.__Internal*)__Instance)->qualifier = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DependentNameType.__Internal*)__Instance)->qualifier = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5708,7 +5740,7 @@ namespace CppSharp
 
             public unsafe partial class PackExpansionType : global::CppSharp.Parser.AST.Type, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -5874,7 +5906,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5887,14 +5921,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class VectorType : global::CppSharp.Parser.AST.Type, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 28)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -5983,7 +6019,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.VectorType.__Internal*)__Instance)->elementType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.VectorType.__Internal*)__Instance)->elementType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -6316,13 +6354,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -6818,7 +6856,7 @@ namespace CppSharp
 
             public unsafe partial class DeclarationContext : global::CppSharp.Parser.AST.Declaration, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 496)]
+                [StructLayout(LayoutKind.Explicit, Size = 489)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -6843,13 +6881,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -6909,7 +6947,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(488)]
                     internal byte isAnonymous;
@@ -7520,13 +7558,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -7658,7 +7696,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TypedefNameDecl.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TypedefNameDecl.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -7690,13 +7730,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -7842,13 +7882,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -8015,13 +8055,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -8170,7 +8210,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8329,7 +8369,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8432,7 +8472,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(48)]
                     internal global::System.IntPtr LHS;
@@ -8441,7 +8481,7 @@ namespace CppSharp
                     internal global::System.IntPtr RHS;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8601,7 +8641,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(48)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_S_allocator__S0_ Arguments;
@@ -8760,7 +8800,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(48)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_S_allocator__S0_ Arguments;
@@ -8934,13 +8974,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -9082,7 +9122,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Parameter.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Parameter.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9189,13 +9231,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -9255,7 +9297,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(488)]
                     internal byte isAnonymous;
@@ -9294,13 +9336,13 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CXXOperatorKind operatorKind;
 
                     [FieldOffset(528)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(560)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C signature;
+                    internal global::Std.BasicString.__Internal signature;
 
                     [FieldOffset(592)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C body;
+                    internal global::Std.BasicString.__Internal body;
 
                     [FieldOffset(624)]
                     internal global::System.IntPtr bodyStmt;
@@ -9456,7 +9498,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->returnType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->returnType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9714,7 +9758,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9755,13 +9801,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -9821,7 +9867,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(488)]
                     internal byte isAnonymous;
@@ -9860,13 +9906,13 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CXXOperatorKind operatorKind;
 
                     [FieldOffset(528)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(560)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C signature;
+                    internal global::Std.BasicString.__Internal signature;
 
                     [FieldOffset(592)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C body;
+                    internal global::Std.BasicString.__Internal body;
 
                     [FieldOffset(624)]
                     internal global::System.IntPtr bodyStmt;
@@ -10159,7 +10205,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Method.__Internal*)__Instance)->conversionType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Method.__Internal*)__Instance)->conversionType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -10213,13 +10261,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -10279,7 +10327,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(488)]
                     internal byte isAnonymous;
@@ -10372,13 +10420,13 @@ namespace CppSharp
                         internal int lineNumberEnd;
 
                         [FieldOffset(40)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                        internal global::Std.BasicString.__Internal name;
 
                         [FieldOffset(72)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                        internal global::Std.BasicString.__Internal USR;
 
                         [FieldOffset(104)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                        internal global::Std.BasicString.__Internal debugText;
 
                         [FieldOffset(136)]
                         internal byte isIncomplete;
@@ -10411,7 +10459,7 @@ namespace CppSharp
                         internal global::System.IntPtr comment;
 
                         [FieldOffset(224)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C expression;
+                        internal global::Std.BasicString.__Internal expression;
 
                         [FieldOffset(256)]
                         internal ulong value;
@@ -10721,13 +10769,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -10760,7 +10808,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(256)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -10873,14 +10921,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Variable.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Variable.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class BaseClassSpecifier : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 20)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -11062,13 +11112,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -11204,7 +11254,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Field.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Field.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -11280,13 +11332,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -11849,7 +11901,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.VFTableInfo.__Internal*)__Instance)->layout = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.VTableLayout.__Internal() : *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.VFTableInfo.__Internal*)__Instance)->layout = *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -11863,7 +11917,7 @@ namespace CppSharp
                     internal uint offset;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -12001,7 +12055,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.LayoutField.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.LayoutField.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -12439,7 +12495,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ClassLayout.__Internal*)__Instance)->layout = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.VTableLayout.__Internal() : *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ClassLayout.__Internal*)__Instance)->layout = *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
                     }
                 }
 
@@ -12563,13 +12621,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -12629,7 +12687,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(488)]
                     internal byte isAnonymous;
@@ -13150,13 +13208,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -13395,13 +13453,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -13525,7 +13583,7 @@ namespace CppSharp
 
             public unsafe partial class TemplateParameter : global::CppSharp.Parser.AST.Declaration, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 240)]
+                [StructLayout(LayoutKind.Explicit, Size = 233)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -13550,13 +13608,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -13727,7 +13785,7 @@ namespace CppSharp
 
             public unsafe partial class TemplateTemplateParameter : global::CppSharp.Parser.AST.Template, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 264)]
+                [StructLayout(LayoutKind.Explicit, Size = 259)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -13752,13 +13810,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -13955,13 +14013,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -14097,14 +14155,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TypeTemplateParameter.__Internal*)__Instance)->defaultArgument = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TypeTemplateParameter.__Internal*)__Instance)->defaultArgument = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class NonTypeTemplateParameter : global::CppSharp.Parser.AST.TemplateParameter, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 264)]
+                [StructLayout(LayoutKind.Explicit, Size = 262)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -14129,13 +14189,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -14377,13 +14437,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -14603,7 +14663,7 @@ namespace CppSharp
 
             public unsafe partial class ClassTemplateSpecialization : global::CppSharp.Parser.AST.Class, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 656)]
+                [StructLayout(LayoutKind.Explicit, Size = 652)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -14628,13 +14688,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -14694,7 +14754,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(488)]
                     internal byte isAnonymous;
@@ -14919,7 +14979,7 @@ namespace CppSharp
 
             public unsafe partial class ClassTemplatePartialSpecialization : global::CppSharp.Parser.AST.ClassTemplateSpecialization, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 656)]
+                [StructLayout(LayoutKind.Explicit, Size = 652)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -14944,13 +15004,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -15010,7 +15070,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(488)]
                     internal byte isAnonymous;
@@ -15180,13 +15240,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -15386,7 +15446,7 @@ namespace CppSharp
 
             public unsafe partial class FunctionTemplateSpecialization : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 44)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -15619,13 +15679,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -15845,7 +15905,7 @@ namespace CppSharp
 
             public unsafe partial class VarTemplateSpecialization : global::CppSharp.Parser.AST.Variable, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 312)]
+                [StructLayout(LayoutKind.Explicit, Size = 308)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -15870,13 +15930,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -15909,7 +15969,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(256)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -16089,7 +16149,7 @@ namespace CppSharp
 
             public unsafe partial class VarTemplatePartialSpecialization : global::CppSharp.Parser.AST.VarTemplateSpecialization, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 312)]
+                [StructLayout(LayoutKind.Explicit, Size = 308)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -16114,13 +16174,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -16153,7 +16213,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(256)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -16253,7 +16313,7 @@ namespace CppSharp
 
             public unsafe partial class Namespace : global::CppSharp.Parser.AST.DeclarationContext, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 496)]
+                [StructLayout(LayoutKind.Explicit, Size = 490)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -16278,13 +16338,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -16344,7 +16404,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(488)]
                     internal byte isAnonymous;
@@ -16451,7 +16511,7 @@ namespace CppSharp
 
             public unsafe partial class PreprocessedEntity : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 20)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -16600,10 +16660,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.DeclarationKind kind;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C expression;
+                    internal global::Std.BasicString.__Internal expression;
 
                     [FieldOffset(88)]
                     internal int lineNumberStart;
@@ -16768,10 +16828,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.DeclarationKind kind;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [FieldOffset(88)]
                     internal global::System.IntPtr definition;
@@ -16937,13 +16997,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -17003,7 +17063,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(488)]
                     internal byte isAnonymous;
@@ -17012,7 +17072,7 @@ namespace CppSharp
                     internal byte isInline;
 
                     [FieldOffset(496)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C fileName;
+                    internal global::Std.BasicString.__Internal fileName;
 
                     [FieldOffset(528)]
                     internal byte isSystemHeader;
@@ -17212,7 +17272,7 @@ namespace CppSharp
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                         EntryPoint="_ZN8CppSharp9CppParser3AST10ASTContext18FindOrCreateModuleENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE")]
-                    internal static extern global::System.IntPtr FindOrCreateModule(global::System.IntPtr __instance, global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C File);
+                    internal static extern global::System.IntPtr FindOrCreateModule(global::System.IntPtr __instance, global::System.IntPtr File);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -17315,9 +17375,8 @@ namespace CppSharp
                 {
                     var __basicString0 = new global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>();
                     global::Std.BasicStringExtensions.Assign(__basicString0, File);
-                    var __arg0 = *(global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C*) __basicString0.__Instance;
+                    var __arg0 = __basicString0.__Instance;
                     var __ret = __Internal.FindOrCreateModule((__Instance + __PointerAdjustment), __arg0);
-                    __basicString0.Dispose(false);
                     global::CppSharp.Parser.AST.TranslationUnit __result0;
                     if (__ret == IntPtr.Zero) __result0 = null;
                     else if (global::CppSharp.Parser.AST.TranslationUnit.NativeToManagedMap.ContainsKey(__ret))
@@ -17638,7 +17697,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->sourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->sourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -17865,7 +17926,7 @@ namespace CppSharp
 
             public unsafe partial class NullStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 28)]
+                [StructLayout(LayoutKind.Explicit, Size = 25)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -18392,7 +18453,7 @@ namespace CppSharp
 
             public unsafe partial class CaseStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 65)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -18571,7 +18632,7 @@ namespace CppSharp
 
             public unsafe partial class DefaultStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 44)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -18926,7 +18987,7 @@ namespace CppSharp
 
             public unsafe partial class IfStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 81)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -19223,7 +19284,7 @@ namespace CppSharp
 
             public unsafe partial class SwitchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 65)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -19626,7 +19687,7 @@ namespace CppSharp
 
             public unsafe partial class DoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 52)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -20466,7 +20527,7 @@ namespace CppSharp
 
             public unsafe partial class ReturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -20927,7 +20988,7 @@ namespace CppSharp
 
             public unsafe partial class GCCAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -20990,7 +21051,7 @@ namespace CppSharp
 
                 public unsafe partial class AsmStringPiece : IDisposable
                 {
-                    [StructLayout(LayoutKind.Explicit, Size = 48)]
+                    [StructLayout(LayoutKind.Explicit, Size = 45)]
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
@@ -21000,7 +21061,7 @@ namespace CppSharp
                         internal byte isOperand;
 
                         [FieldOffset(8)]
-                        internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                        internal global::Std.BasicString.__Internal @string;
 
                         [FieldOffset(40)]
                         internal uint operandNo;
@@ -21310,7 +21371,7 @@ namespace CppSharp
                     internal uint numAsmToks;
 
                     [FieldOffset(112)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C asmString;
+                    internal global::Std.BasicString.__Internal asmString;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -22000,7 +22061,7 @@ namespace CppSharp
 
             public unsafe partial class CapturedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -22494,7 +22555,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXCatchStmt.__Internal*)__Instance)->caughtType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXCatchStmt.__Internal*)__Instance)->caughtType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -22519,7 +22582,7 @@ namespace CppSharp
 
             public unsafe partial class CXXTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -23941,7 +24004,7 @@ namespace CppSharp
 
             public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -24080,7 +24143,7 @@ namespace CppSharp
 
                 public unsafe partial class Classification : IDisposable
                 {
-                    [StructLayout(LayoutKind.Explicit, Size = 16)]
+                    [StructLayout(LayoutKind.Explicit, Size = 14)]
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
@@ -24399,7 +24462,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Expr.__Internal*)__Instance)->type = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Expr.__Internal*)__Instance)->type = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -25047,7 +25112,7 @@ namespace CppSharp
 
             public unsafe partial class DeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 121)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -26166,7 +26231,7 @@ namespace CppSharp
 
             public unsafe partial class StringLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 172)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -26224,10 +26289,10 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(80)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(112)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C bytes;
+                    internal global::Std.BasicString.__Internal bytes;
 
                     [FieldOffset(144)]
                     internal uint byteLength;
@@ -26564,7 +26629,7 @@ namespace CppSharp
 
             public unsafe partial class PredefinedExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -26905,7 +26970,7 @@ namespace CppSharp
 
             public unsafe partial class UnaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 99)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -27192,7 +27257,7 @@ namespace CppSharp
 
             public unsafe partial class OffsetOfExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -27579,7 +27644,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->argumentType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->argumentType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -27610,7 +27677,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->typeOfArgument = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->typeOfArgument = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -27839,7 +27908,7 @@ namespace CppSharp
 
             public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 149)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -28200,7 +28269,7 @@ namespace CppSharp
 
             public unsafe partial class MemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 125)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -28978,7 +29047,7 @@ namespace CppSharp
 
             public unsafe partial class ImplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 121)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -29313,7 +29382,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*)__Instance)->typeAsWritten = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*)__Instance)->typeAsWritten = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -29498,7 +29569,7 @@ namespace CppSharp
 
             public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 150)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -29568,7 +29639,7 @@ namespace CppSharp
                     internal global::System.IntPtr rHS;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [FieldOffset(136)]
                     internal byte isPtrMemOp;
@@ -30047,7 +30118,7 @@ namespace CppSharp
                     internal global::System.IntPtr rHS;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [FieldOffset(136)]
                     internal byte isPtrMemOp;
@@ -30189,7 +30260,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationLHSType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationLHSType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -30202,7 +30275,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationResultType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationResultType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -30803,7 +30878,7 @@ namespace CppSharp
 
             public unsafe partial class AddrLabelExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -31885,7 +31960,7 @@ namespace CppSharp
 
             public unsafe partial class VAArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -32076,7 +32151,7 @@ namespace CppSharp
 
             public unsafe partial class InitListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 129)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -32405,7 +32480,7 @@ namespace CppSharp
 
             public unsafe partial class DesignatedInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 108)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -32493,7 +32568,7 @@ namespace CppSharp
 
                 public unsafe partial class Designator : IDisposable
                 {
-                    [StructLayout(LayoutKind.Explicit, Size = 48)]
+                    [StructLayout(LayoutKind.Explicit, Size = 44)]
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
@@ -32755,7 +32830,9 @@ namespace CppSharp
 
                         set
                         {
-                            ((global::CppSharp.Parser.AST.DesignatedInitExpr.Designator.__Internal*)__Instance)->sourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                            if (ReferenceEquals(value, null))
+                                throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                            ((global::CppSharp.Parser.AST.DesignatedInitExpr.Designator.__Internal*)__Instance)->sourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                         }
                     }
                 }
@@ -33066,14 +33143,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DesignatedInitExpr.__Internal*)__Instance)->designatorsSourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DesignatedInitExpr.__Internal*)__Instance)->designatorsSourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class NoInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -33523,7 +33602,7 @@ namespace CppSharp
 
             public unsafe partial class ArrayInitIndexExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -33645,7 +33724,7 @@ namespace CppSharp
 
             public unsafe partial class ImplicitValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -34197,7 +34276,7 @@ namespace CppSharp
 
             public unsafe partial class ExtVectorElementExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 98)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -34738,7 +34817,7 @@ namespace CppSharp
 
             public unsafe partial class PseudoObjectExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 108)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -34934,7 +35013,7 @@ namespace CppSharp
 
             public unsafe partial class AtomicExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 172)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -35283,7 +35362,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AtomicExpr.__Internal*)__Instance)->valueType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AtomicExpr.__Internal*)__Instance)->valueType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -35381,7 +35462,7 @@ namespace CppSharp
 
             public unsafe partial class TypoExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -35503,7 +35584,7 @@ namespace CppSharp
 
             public unsafe partial class CXXOperatorCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 165)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -36378,7 +36459,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*)__Instance)->angleBrackets = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*)__Instance)->angleBrackets = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -36543,7 +36626,7 @@ namespace CppSharp
 
             public unsafe partial class CXXDynamicCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 161)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -37033,7 +37116,7 @@ namespace CppSharp
 
             public unsafe partial class UserDefinedLiteral : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 172)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -37701,7 +37784,7 @@ namespace CppSharp
 
             public unsafe partial class CXXTypeidExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 90)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38247,7 +38330,7 @@ namespace CppSharp
 
             public unsafe partial class CXXUuidofExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 121)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38308,7 +38391,7 @@ namespace CppSharp
                     internal global::System.IntPtr exprOperand;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C uuidStr;
+                    internal global::Std.BasicString.__Internal uuidStr;
 
                     [FieldOffset(120)]
                     internal byte isTypeOperand;
@@ -38446,7 +38529,7 @@ namespace CppSharp
 
             public unsafe partial class CXXThisExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 81)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38600,7 +38683,7 @@ namespace CppSharp
 
             public unsafe partial class CXXThrowExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 93)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38775,7 +38858,7 @@ namespace CppSharp
 
             public unsafe partial class CXXDefaultArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -39566,7 +39649,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXConstructExpr.__Internal*)__Instance)->parenOrBraceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXConstructExpr.__Internal*)__Instance)->parenOrBraceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -39765,7 +39850,7 @@ namespace CppSharp
 
             public unsafe partial class CXXFunctionalCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 145)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -40129,7 +40214,7 @@ namespace CppSharp
 
             public unsafe partial class LambdaExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 147)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -40378,7 +40463,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.LambdaExpr.__Internal*)__Instance)->introducerRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.LambdaExpr.__Internal*)__Instance)->introducerRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -40901,7 +40988,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->allocatedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->allocatedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -40971,7 +41060,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->typeIdParens = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->typeIdParens = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41059,7 +41150,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->directInitRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->directInitRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41296,14 +41389,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXDeleteExpr.__Internal*)__Instance)->destroyedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXDeleteExpr.__Internal*)__Instance)->destroyedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class CXXPseudoDestructorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 124)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -41538,7 +41633,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXPseudoDestructorExpr.__Internal*)__Instance)->destroyedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXPseudoDestructorExpr.__Internal*)__Instance)->destroyedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41849,7 +41946,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ArrayTypeTraitExpr.__Internal*)__Instance)->queriedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ArrayTypeTraitExpr.__Internal*)__Instance)->queriedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41887,7 +41986,7 @@ namespace CppSharp
 
             public unsafe partial class ExpressionTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 89)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -42403,7 +42502,7 @@ namespace CppSharp
 
             public unsafe partial class UnresolvedLookupExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 106)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -42581,7 +42680,7 @@ namespace CppSharp
 
             public unsafe partial class DependentScopeDeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -42815,7 +42914,7 @@ namespace CppSharp
 
             public unsafe partial class ExprWithCleanups : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 93)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -43209,7 +43308,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXUnresolvedConstructExpr.__Internal*)__Instance)->typeAsWritten = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXUnresolvedConstructExpr.__Internal*)__Instance)->typeAsWritten = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43449,7 +43550,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXDependentScopeMemberExpr.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXDependentScopeMemberExpr.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43591,7 +43694,7 @@ namespace CppSharp
 
             public unsafe partial class UnresolvedMemberExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 148)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -43795,7 +43898,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnresolvedMemberExpr.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnresolvedMemberExpr.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43854,7 +43959,7 @@ namespace CppSharp
 
             public unsafe partial class CXXNoexceptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 89)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -44013,7 +44118,7 @@ namespace CppSharp
 
             public unsafe partial class PackExpansionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -44172,7 +44277,7 @@ namespace CppSharp
 
             public unsafe partial class SizeOfPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 101)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -44701,14 +44806,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.SubstNonTypeTemplateParmPackExpr.__Internal*)__Instance)->argumentPack = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.TemplateArgument.__Internal() : *(global::CppSharp.Parser.AST.TemplateArgument.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.SubstNonTypeTemplateParmPackExpr.__Internal*)__Instance)->argumentPack = *(global::CppSharp.Parser.AST.TemplateArgument.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class FunctionParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -44862,7 +44969,7 @@ namespace CppSharp
 
             public unsafe partial class MaterializeTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 101)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -45864,7 +45971,7 @@ namespace CppSharp
 
             public unsafe partial class DependentCoawaitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -46231,7 +46338,7 @@ namespace CppSharp
             public partial struct __Internal
             {
                 [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C ABI;
+                internal global::Std.BasicString.__Internal ABI;
 
                 [FieldOffset(32)]
                 internal global::CppSharp.Parser.ParserIntType char16Type;
@@ -47069,7 +47176,7 @@ namespace CppSharp
                 internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ Arguments;
 
                 [FieldOffset(24)]
-                internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C libraryFile;
+                internal global::Std.BasicString.__Internal libraryFile;
 
                 [FieldOffset(56)]
                 internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ SourceFiles;
@@ -47099,10 +47206,10 @@ namespace CppSharp
                 internal int toolSetToUse;
 
                 [FieldOffset(240)]
-                internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C targetTriple;
+                internal global::Std.BasicString.__Internal targetTriple;
 
                 [FieldOffset(272)]
-                internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C currentDir;
+                internal global::Std.BasicString.__Internal currentDir;
 
                 [FieldOffset(304)]
                 internal byte noStandardIncludes;
@@ -47766,14 +47873,14 @@ namespace CppSharp
 
         public unsafe partial class ParserDiagnostic : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 80)]
+            [StructLayout(LayoutKind.Explicit, Size = 76)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C fileName;
+                internal global::Std.BasicString.__Internal fileName;
 
                 [FieldOffset(32)]
-                internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C message;
+                internal global::Std.BasicString.__Internal message;
 
                 [FieldOffset(64)]
                 internal global::CppSharp.Parser.ParserDiagnosticLevel level;
@@ -48179,7 +48286,7 @@ namespace CppSharp
 
         public unsafe partial class ClangParser : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 0)]
+            [StructLayout(LayoutKind.Explicit, Size = 1)]
             public partial struct __Internal
             {
                 [SuppressUnmanagedCodeSecurity]
@@ -48303,7 +48410,7 @@ namespace Std
         public unsafe partial struct __Internalc__N_std_S_pair__1__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration
         {
             [FieldOffset(0)]
-            internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C first;
+            internal global::Std.BasicString.__Internal first;
 
             [FieldOffset(32)]
             internal global::System.IntPtr second;
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs
index 2a7431f6..f55f84d1 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs
@@ -668,82 +668,13 @@ namespace Std
     }
 }
 
-namespace Std
-{
-    namespace Less
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 0)]
-        public unsafe partial struct __Internal
-        {
-        }
-    }
-}
-
-namespace Std
-{
-    public enum RbTreeColor : uint
-    {
-    }
-
-    namespace RbTree
-    {
-        namespace RbTreeImpl
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 48)]
-            public unsafe partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal global::Std.Less.__Internal _M_key_compare;
-
-                [FieldOffset(8)]
-                internal global::Std.RbTreeNodeBase.__Internal _M_header;
-
-                [FieldOffset(40)]
-                internal ulong _M_node_count;
-            }
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 48)]
-        public unsafe partial struct __Internalc__N_std_S__Rb_tree____N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_pair__1S0_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S__Select1st__S3____N_std_S_less__S0____N_std_S_allocator__S3_
-        {
-            [FieldOffset(0)]
-            internal global::Std.RbTree.RbTreeImpl.__Internal _M_impl;
-        }
-    }
-
-    public unsafe partial class RbTreeNodeBase
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 32)]
-        public partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal global::Std.RbTreeColor _M_color;
-
-            [FieldOffset(8)]
-            internal global::System.IntPtr _M_parent;
-
-            [FieldOffset(16)]
-            internal global::System.IntPtr _M_left;
-
-            [FieldOffset(24)]
-            internal global::System.IntPtr _M_right;
-        }
-    }
-}
-
-namespace GnuCxx
-{
-}
-
 namespace Std
 {
     namespace Map
     {
         [StructLayout(LayoutKind.Explicit, Size = 48)]
-        public unsafe partial struct __Internalc__N_std_S_map____N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_
+        public unsafe partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal global::Std.RbTree.__Internalc__N_std_S__Rb_tree____N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_pair__1S0_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S__Select1st__S3____N_std_S_less__S0____N_std_S_allocator__S3_ _M_t;
         }
     }
 }
@@ -756,7 +687,7 @@ namespace Std
 {
     namespace CharTraits
     {
-        [StructLayout(LayoutKind.Explicit, Size = 0)]
+        [StructLayout(LayoutKind.Explicit, Size = 1)]
         public unsafe partial struct __Internal
         {
         }
@@ -826,17 +757,8 @@ namespace Std
     namespace BasicString
     {
         [StructLayout(LayoutKind.Explicit, Size = 32)]
-        public unsafe partial struct __Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C
+        public unsafe partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal global::Std.BasicString.AllocHider.__Internal _M_dataplus;
-
-            [FieldOffset(8)]
-            internal ulong _M_string_length;
-
-            [FieldOffset(16)]
-            internal global::Std.BasicString._3.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C _0;
-
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                 EntryPoint="_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2Ev")]
@@ -852,31 +774,6 @@ namespace Std
                 EntryPoint="_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE5c_strEv")]
             internal static extern global::System.IntPtr CStrc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance);
         }
-
-        namespace AllocHider
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 8)]
-            public unsafe partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal global::System.IntPtr _M_p;
-            }
-
-        }
-
-        namespace _3
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 16)]
-            public unsafe partial struct __Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C
-            {
-                [FieldOffset(0)]
-                internal fixed sbyte _M_local_buf[16];
-
-                [FieldOffset(0)]
-                internal ulong _M_allocated_capacity;
-            }
-        }
-
     }
 
     public unsafe partial class BasicString<_CharT, _Traits, _Alloc> : IDisposable
@@ -894,19 +791,19 @@ namespace Std
             return new global::Std.BasicString<_CharT, _Traits, _Alloc>(native.ToPointer(), skipVTables);
         }
 
-        internal static global::Std.BasicString<_CharT, _Traits, _Alloc> __CreateInstance(global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native, bool skipVTables = false)
+        internal static global::Std.BasicString<_CharT, _Traits, _Alloc> __CreateInstance(global::Std.BasicString.__Internal native, bool skipVTables = false)
         {
             return new global::Std.BasicString<_CharT, _Traits, _Alloc>(native, skipVTables);
         }
 
-        private static void* __CopyValue(global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native)
+        private static void* __CopyValue(global::Std.BasicString.__Internal native)
         {
-            var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
-            *(global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C*) ret = native;
+            var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internal));
+            *(global::Std.BasicString.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
-        private BasicString(global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native, bool skipVTables = false)
+        private BasicString(global::Std.BasicString.__Internal native, bool skipVTables = false)
             : this(__CopyValue(native), skipVTables)
         {
             __ownsNativeInstance = true;
@@ -927,10 +824,10 @@ namespace Std
             var ___Alloc = typeof(_Alloc);
             if (___CharT.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Alloc.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
             {
-                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
+                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internal));
                 __ownsNativeInstance = true;
                 NativeToManagedMap[__Instance] = this;
-                global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.ctorc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment));
+                global::Std.BasicString.__Internal.ctorc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment));
                 return;
             }
             throw new ArgumentOutOfRangeException("_CharT, _Traits, _Alloc", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_CharT, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
@@ -954,7 +851,7 @@ namespace Std
                 var ___Alloc = typeof(_Alloc);
                 if (___CharT.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Alloc.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
                 {
-                    global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.dtorc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment));
+                    global::Std.BasicString.__Internal.dtorc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment));
                     return;
                 }
                 throw new ArgumentOutOfRangeException("_CharT, _Traits, _Alloc", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_CharT, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
index 611e35c7..a895455a 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
@@ -61,7 +61,7 @@ namespace CppSharp
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C fileName;
+                    internal global::Std.BasicString.__Internal fileName;
 
                     [FieldOffset(8)]
                     internal global::CppSharp.Parser.AST.ArchType archType;
@@ -633,7 +633,7 @@ namespace CppSharp
 
             public unsafe partial class InlineContentComment : global::CppSharp.Parser.AST.Comment, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -965,7 +965,7 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                        internal global::Std.BasicString.__Internal text;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1520,7 +1520,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CommentKind kind;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1797,7 +1797,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S_allocator__S0_ Arguments;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1969,7 +1969,7 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                        internal global::Std.BasicString.__Internal text;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2205,7 +2205,7 @@ namespace CppSharp
 
             public unsafe partial class HTMLTagComment : global::CppSharp.Parser.AST.InlineContentComment, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -2308,7 +2308,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C tagName;
+                    internal global::Std.BasicString.__Internal tagName;
 
                     [FieldOffset(16)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_S_allocator__S0_ Attributes;
@@ -2355,10 +2355,10 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                        internal global::Std.BasicString.__Internal name;
 
                         [FieldOffset(8)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C value;
+                        internal global::Std.BasicString.__Internal value;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2610,7 +2610,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C tagName;
+                    internal global::Std.BasicString.__Internal tagName;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2724,7 +2724,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2835,10 +2835,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.RawCommentKind kind;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C briefText;
+                    internal global::Std.BasicString.__Internal briefText;
 
                     [FieldOffset(24)]
                     internal global::System.IntPtr fullCommentBlock;
@@ -3299,7 +3299,7 @@ namespace CppSharp
 
             public unsafe partial class Type : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -3557,7 +3557,7 @@ namespace CppSharp
 
             public unsafe partial class QualifiedType : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 16)]
+                [StructLayout(LayoutKind.Explicit, Size = 11)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -3675,7 +3675,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.QualifiedType.__Internal*)__Instance)->qualifiers = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.TypeQualifiers.__Internal() : *(global::CppSharp.Parser.AST.TypeQualifiers.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.QualifiedType.__Internal*)__Instance)->qualifiers = *(global::CppSharp.Parser.AST.TypeQualifiers.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -3883,7 +3885,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ArrayType.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ArrayType.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4086,7 +4090,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.FunctionType.__Internal*)__Instance)->returnType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.FunctionType.__Internal*)__Instance)->returnType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4128,7 +4134,7 @@ namespace CppSharp
 
             public unsafe partial class PointerType : global::CppSharp.Parser.AST.Type, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 28)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -4225,7 +4231,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.PointerType.__Internal*)__Instance)->qualifiedPointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.PointerType.__Internal*)__Instance)->qualifiedPointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4331,7 +4339,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.MemberPointerType.__Internal*)__Instance)->pointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.MemberPointerType.__Internal*)__Instance)->pointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4525,7 +4535,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->modified = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->modified = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4538,7 +4550,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->equivalent = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->equivalent = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4637,7 +4651,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->decayed = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->decayed = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4650,7 +4666,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->original = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->original = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4663,7 +4681,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->pointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->pointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4801,7 +4821,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateArgument.__Internal*)__Instance)->type = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateArgument.__Internal*)__Instance)->type = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5007,7 +5029,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateSpecializationType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateSpecializationType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5170,7 +5194,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DependentTemplateSpecializationType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DependentTemplateSpecializationType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5186,7 +5212,7 @@ namespace CppSharp
 
             public unsafe partial class TemplateParameterType : global::CppSharp.Parser.AST.Type, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 25)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -5439,7 +5465,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateParameterSubstitutionType.__Internal*)__Instance)->replacement = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateParameterSubstitutionType.__Internal*)__Instance)->replacement = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5553,7 +5581,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.InjectedClassNameType.__Internal*)__Instance)->injectedSpecializationType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.InjectedClassNameType.__Internal*)__Instance)->injectedSpecializationType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5591,7 +5621,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifier;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C identifier;
+                    internal global::Std.BasicString.__Internal identifier;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -5685,7 +5715,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DependentNameType.__Internal*)__Instance)->qualifier = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DependentNameType.__Internal*)__Instance)->qualifier = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5708,7 +5740,7 @@ namespace CppSharp
 
             public unsafe partial class PackExpansionType : global::CppSharp.Parser.AST.Type, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
+                [StructLayout(LayoutKind.Explicit, Size = 5)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -5874,7 +5906,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5887,14 +5921,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class VectorType : global::CppSharp.Parser.AST.Type, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 32)]
+                [StructLayout(LayoutKind.Explicit, Size = 28)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -5983,7 +6019,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.VectorType.__Internal*)__Instance)->elementType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.VectorType.__Internal*)__Instance)->elementType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -6316,13 +6354,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -6818,7 +6856,7 @@ namespace CppSharp
 
             public unsafe partial class DeclarationContext : global::CppSharp.Parser.AST.Declaration, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 424)]
+                [StructLayout(LayoutKind.Explicit, Size = 417)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -6843,13 +6881,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -6909,7 +6947,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(368)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(416)]
                     internal byte isAnonymous;
@@ -7520,13 +7558,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -7658,7 +7696,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TypedefNameDecl.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TypedefNameDecl.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -7690,13 +7730,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -7842,13 +7882,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -8015,13 +8055,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -8170,7 +8210,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8329,7 +8369,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8432,7 +8472,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(24)]
                     internal global::System.IntPtr LHS;
@@ -8441,7 +8481,7 @@ namespace CppSharp
                     internal global::System.IntPtr RHS;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8601,7 +8641,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(24)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_S_allocator__S0_ Arguments;
@@ -8760,7 +8800,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(24)]
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_S_allocator__S0_ Arguments;
@@ -8934,13 +8974,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -9082,7 +9122,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Parameter.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Parameter.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9189,13 +9231,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -9255,7 +9297,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(368)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(416)]
                     internal byte isAnonymous;
@@ -9294,13 +9336,13 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CXXOperatorKind operatorKind;
 
                     [FieldOffset(456)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(464)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C signature;
+                    internal global::Std.BasicString.__Internal signature;
 
                     [FieldOffset(472)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C body;
+                    internal global::Std.BasicString.__Internal body;
 
                     [FieldOffset(480)]
                     internal global::System.IntPtr bodyStmt;
@@ -9456,7 +9498,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->returnType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->returnType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9714,7 +9758,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9755,13 +9801,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -9821,7 +9867,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(368)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(416)]
                     internal byte isAnonymous;
@@ -9860,13 +9906,13 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CXXOperatorKind operatorKind;
 
                     [FieldOffset(456)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(464)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C signature;
+                    internal global::Std.BasicString.__Internal signature;
 
                     [FieldOffset(472)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C body;
+                    internal global::Std.BasicString.__Internal body;
 
                     [FieldOffset(480)]
                     internal global::System.IntPtr bodyStmt;
@@ -10159,7 +10205,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Method.__Internal*)__Instance)->conversionType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Method.__Internal*)__Instance)->conversionType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -10213,13 +10261,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -10279,7 +10327,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(368)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(416)]
                     internal byte isAnonymous;
@@ -10372,13 +10420,13 @@ namespace CppSharp
                         internal int lineNumberEnd;
 
                         [FieldOffset(40)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                        internal global::Std.BasicString.__Internal name;
 
                         [FieldOffset(48)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                        internal global::Std.BasicString.__Internal USR;
 
                         [FieldOffset(56)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                        internal global::Std.BasicString.__Internal debugText;
 
                         [FieldOffset(64)]
                         internal byte isIncomplete;
@@ -10411,7 +10459,7 @@ namespace CppSharp
                         internal global::System.IntPtr comment;
 
                         [FieldOffset(152)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C expression;
+                        internal global::Std.BasicString.__Internal expression;
 
                         [FieldOffset(160)]
                         internal ulong value;
@@ -10721,13 +10769,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -10760,7 +10808,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(152)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -10873,14 +10921,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Variable.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Variable.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class BaseClassSpecifier : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 20)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -11062,13 +11112,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -11204,7 +11254,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Field.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Field.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -11280,13 +11332,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -11849,7 +11901,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.VFTableInfo.__Internal*)__Instance)->layout = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.VTableLayout.__Internal() : *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.VFTableInfo.__Internal*)__Instance)->layout = *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -11863,7 +11917,7 @@ namespace CppSharp
                     internal uint offset;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(16)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -12001,7 +12055,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.LayoutField.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.LayoutField.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -12439,7 +12495,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ClassLayout.__Internal*)__Instance)->layout = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.VTableLayout.__Internal() : *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ClassLayout.__Internal*)__Instance)->layout = *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
                     }
                 }
 
@@ -12563,13 +12621,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -12629,7 +12687,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(368)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(416)]
                     internal byte isAnonymous;
@@ -13150,13 +13208,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -13395,13 +13453,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -13525,7 +13583,7 @@ namespace CppSharp
 
             public unsafe partial class TemplateParameter : global::CppSharp.Parser.AST.Declaration, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 161)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -13550,13 +13608,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -13727,7 +13785,7 @@ namespace CppSharp
 
             public unsafe partial class TemplateTemplateParameter : global::CppSharp.Parser.AST.Template, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 192)]
+                [StructLayout(LayoutKind.Explicit, Size = 187)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -13752,13 +13810,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -13955,13 +14013,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -14097,14 +14155,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TypeTemplateParameter.__Internal*)__Instance)->defaultArgument = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TypeTemplateParameter.__Internal*)__Instance)->defaultArgument = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class NonTypeTemplateParameter : global::CppSharp.Parser.AST.TemplateParameter, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 192)]
+                [StructLayout(LayoutKind.Explicit, Size = 190)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -14129,13 +14189,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -14377,13 +14437,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -14603,7 +14663,7 @@ namespace CppSharp
 
             public unsafe partial class ClassTemplateSpecialization : global::CppSharp.Parser.AST.Class, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 584)]
+                [StructLayout(LayoutKind.Explicit, Size = 580)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -14628,13 +14688,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -14694,7 +14754,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(368)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(416)]
                     internal byte isAnonymous;
@@ -14919,7 +14979,7 @@ namespace CppSharp
 
             public unsafe partial class ClassTemplatePartialSpecialization : global::CppSharp.Parser.AST.ClassTemplateSpecialization, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 584)]
+                [StructLayout(LayoutKind.Explicit, Size = 580)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -14944,13 +15004,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -15010,7 +15070,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(368)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(416)]
                     internal byte isAnonymous;
@@ -15180,13 +15240,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -15386,7 +15446,7 @@ namespace CppSharp
 
             public unsafe partial class FunctionTemplateSpecialization : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 44)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -15619,13 +15679,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -15845,7 +15905,7 @@ namespace CppSharp
 
             public unsafe partial class VarTemplateSpecialization : global::CppSharp.Parser.AST.Variable, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 216)]
+                [StructLayout(LayoutKind.Explicit, Size = 212)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -15870,13 +15930,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -15909,7 +15969,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(152)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -16089,7 +16149,7 @@ namespace CppSharp
 
             public unsafe partial class VarTemplatePartialSpecialization : global::CppSharp.Parser.AST.VarTemplateSpecialization, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 216)]
+                [StructLayout(LayoutKind.Explicit, Size = 212)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -16114,13 +16174,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -16153,7 +16213,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(152)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(160)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -16253,7 +16313,7 @@ namespace CppSharp
 
             public unsafe partial class Namespace : global::CppSharp.Parser.AST.DeclarationContext, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 424)]
+                [StructLayout(LayoutKind.Explicit, Size = 418)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -16278,13 +16338,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -16344,7 +16404,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(368)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(416)]
                     internal byte isAnonymous;
@@ -16451,7 +16511,7 @@ namespace CppSharp
 
             public unsafe partial class PreprocessedEntity : IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 24)]
+                [StructLayout(LayoutKind.Explicit, Size = 20)]
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -16600,10 +16660,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.DeclarationKind kind;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(32)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C expression;
+                    internal global::Std.BasicString.__Internal expression;
 
                     [FieldOffset(40)]
                     internal int lineNumberStart;
@@ -16768,10 +16828,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.DeclarationKind kind;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(32)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [FieldOffset(40)]
                     internal global::System.IntPtr definition;
@@ -16937,13 +16997,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(48)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(64)]
                     internal byte isIncomplete;
@@ -17003,7 +17063,7 @@ namespace CppSharp
                     internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
 
                     [FieldOffset(368)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(416)]
                     internal byte isAnonymous;
@@ -17012,7 +17072,7 @@ namespace CppSharp
                     internal byte isInline;
 
                     [FieldOffset(424)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C fileName;
+                    internal global::Std.BasicString.__Internal fileName;
 
                     [FieldOffset(432)]
                     internal byte isSystemHeader;
@@ -17212,7 +17272,7 @@ namespace CppSharp
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                         EntryPoint="_ZN8CppSharp9CppParser3AST10ASTContext18FindOrCreateModuleESs")]
-                    internal static extern global::System.IntPtr FindOrCreateModule(global::System.IntPtr __instance, global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C File);
+                    internal static extern global::System.IntPtr FindOrCreateModule(global::System.IntPtr __instance, global::System.IntPtr File);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -17315,9 +17375,8 @@ namespace CppSharp
                 {
                     var __basicString0 = new global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>();
                     global::Std.BasicStringExtensions.Assign(__basicString0, File);
-                    var __arg0 = *(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C*) __basicString0.__Instance;
+                    var __arg0 = __basicString0.__Instance;
                     var __ret = __Internal.FindOrCreateModule((__Instance + __PointerAdjustment), __arg0);
-                    __basicString0.Dispose(false);
                     global::CppSharp.Parser.AST.TranslationUnit __result0;
                     if (__ret == IntPtr.Zero) __result0 = null;
                     else if (global::CppSharp.Parser.AST.TranslationUnit.NativeToManagedMap.ContainsKey(__ret))
@@ -17638,7 +17697,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->sourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->sourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -17865,7 +17926,7 @@ namespace CppSharp
 
             public unsafe partial class NullStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 28)]
+                [StructLayout(LayoutKind.Explicit, Size = 25)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -18392,7 +18453,7 @@ namespace CppSharp
 
             public unsafe partial class CaseStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 65)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -18571,7 +18632,7 @@ namespace CppSharp
 
             public unsafe partial class DefaultStmt : global::CppSharp.Parser.AST.SwitchCase, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 48)]
+                [StructLayout(LayoutKind.Explicit, Size = 44)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -18926,7 +18987,7 @@ namespace CppSharp
 
             public unsafe partial class IfStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 81)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -19223,7 +19284,7 @@ namespace CppSharp
 
             public unsafe partial class SwitchStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 72)]
+                [StructLayout(LayoutKind.Explicit, Size = 65)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -19626,7 +19687,7 @@ namespace CppSharp
 
             public unsafe partial class DoStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 56)]
+                [StructLayout(LayoutKind.Explicit, Size = 52)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -20466,7 +20527,7 @@ namespace CppSharp
 
             public unsafe partial class ReturnStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -20927,7 +20988,7 @@ namespace CppSharp
 
             public unsafe partial class GCCAsmStmt : global::CppSharp.Parser.AST.AsmStmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -20990,7 +21051,7 @@ namespace CppSharp
 
                 public unsafe partial class AsmStringPiece : IDisposable
                 {
-                    [StructLayout(LayoutKind.Explicit, Size = 24)]
+                    [StructLayout(LayoutKind.Explicit, Size = 21)]
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
@@ -21000,7 +21061,7 @@ namespace CppSharp
                         internal byte isOperand;
 
                         [FieldOffset(8)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                        internal global::Std.BasicString.__Internal @string;
 
                         [FieldOffset(16)]
                         internal uint operandNo;
@@ -21310,7 +21371,7 @@ namespace CppSharp
                     internal uint numAsmToks;
 
                     [FieldOffset(112)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C asmString;
+                    internal global::Std.BasicString.__Internal asmString;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -22000,7 +22061,7 @@ namespace CppSharp
 
             public unsafe partial class CapturedStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 64)]
+                [StructLayout(LayoutKind.Explicit, Size = 60)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -22494,7 +22555,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXCatchStmt.__Internal*)__Instance)->caughtType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXCatchStmt.__Internal*)__Instance)->caughtType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -22519,7 +22582,7 @@ namespace CppSharp
 
             public unsafe partial class CXXTryStmt : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 40)]
+                [StructLayout(LayoutKind.Explicit, Size = 36)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -23941,7 +24004,7 @@ namespace CppSharp
 
             public unsafe partial class Expr : global::CppSharp.Parser.AST.Stmt, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -24080,7 +24143,7 @@ namespace CppSharp
 
                 public unsafe partial class Classification : IDisposable
                 {
-                    [StructLayout(LayoutKind.Explicit, Size = 16)]
+                    [StructLayout(LayoutKind.Explicit, Size = 14)]
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
@@ -24399,7 +24462,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Expr.__Internal*)__Instance)->type = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Expr.__Internal*)__Instance)->type = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -25047,7 +25112,7 @@ namespace CppSharp
 
             public unsafe partial class DeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 121)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -26166,7 +26231,7 @@ namespace CppSharp
 
             public unsafe partial class StringLiteral : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 124)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -26224,10 +26289,10 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(80)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C bytes;
+                    internal global::Std.BasicString.__Internal bytes;
 
                     [FieldOffset(96)]
                     internal uint byteLength;
@@ -26564,7 +26629,7 @@ namespace CppSharp
 
             public unsafe partial class PredefinedExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -26905,7 +26970,7 @@ namespace CppSharp
 
             public unsafe partial class UnaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 99)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -27192,7 +27257,7 @@ namespace CppSharp
 
             public unsafe partial class OffsetOfExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -27579,7 +27644,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->argumentType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->argumentType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -27610,7 +27677,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->typeOfArgument = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->typeOfArgument = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -27839,7 +27908,7 @@ namespace CppSharp
 
             public unsafe partial class CallExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 149)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -28200,7 +28269,7 @@ namespace CppSharp
 
             public unsafe partial class MemberExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 125)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -28978,7 +29047,7 @@ namespace CppSharp
 
             public unsafe partial class ImplicitCastExpr : global::CppSharp.Parser.AST.CastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 121)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -29313,7 +29382,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*)__Instance)->typeAsWritten = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*)__Instance)->typeAsWritten = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -29498,7 +29569,7 @@ namespace CppSharp
 
             public unsafe partial class BinaryOperator : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 126)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -29568,7 +29639,7 @@ namespace CppSharp
                     internal global::System.IntPtr rHS;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [FieldOffset(112)]
                     internal byte isPtrMemOp;
@@ -30047,7 +30118,7 @@ namespace CppSharp
                     internal global::System.IntPtr rHS;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [FieldOffset(112)]
                     internal byte isPtrMemOp;
@@ -30189,7 +30260,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationLHSType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationLHSType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -30202,7 +30275,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationResultType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationResultType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -30803,7 +30878,7 @@ namespace CppSharp
 
             public unsafe partial class AddrLabelExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -31885,7 +31960,7 @@ namespace CppSharp
 
             public unsafe partial class VAArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -32076,7 +32151,7 @@ namespace CppSharp
 
             public unsafe partial class InitListExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 136)]
+                [StructLayout(LayoutKind.Explicit, Size = 129)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -32405,7 +32480,7 @@ namespace CppSharp
 
             public unsafe partial class DesignatedInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 108)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -32493,7 +32568,7 @@ namespace CppSharp
 
                 public unsafe partial class Designator : IDisposable
                 {
-                    [StructLayout(LayoutKind.Explicit, Size = 48)]
+                    [StructLayout(LayoutKind.Explicit, Size = 44)]
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
@@ -32755,7 +32830,9 @@ namespace CppSharp
 
                         set
                         {
-                            ((global::CppSharp.Parser.AST.DesignatedInitExpr.Designator.__Internal*)__Instance)->sourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                            if (ReferenceEquals(value, null))
+                                throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                            ((global::CppSharp.Parser.AST.DesignatedInitExpr.Designator.__Internal*)__Instance)->sourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                         }
                     }
                 }
@@ -33066,14 +33143,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DesignatedInitExpr.__Internal*)__Instance)->designatorsSourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DesignatedInitExpr.__Internal*)__Instance)->designatorsSourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class NoInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -33523,7 +33602,7 @@ namespace CppSharp
 
             public unsafe partial class ArrayInitIndexExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -33645,7 +33724,7 @@ namespace CppSharp
 
             public unsafe partial class ImplicitValueInitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -34197,7 +34276,7 @@ namespace CppSharp
 
             public unsafe partial class ExtVectorElementExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 98)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -34738,7 +34817,7 @@ namespace CppSharp
 
             public unsafe partial class PseudoObjectExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 108)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -34934,7 +35013,7 @@ namespace CppSharp
 
             public unsafe partial class AtomicExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 172)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -35283,7 +35362,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AtomicExpr.__Internal*)__Instance)->valueType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AtomicExpr.__Internal*)__Instance)->valueType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -35381,7 +35462,7 @@ namespace CppSharp
 
             public unsafe partial class TypoExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 80)]
+                [StructLayout(LayoutKind.Explicit, Size = 73)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -35503,7 +35584,7 @@ namespace CppSharp
 
             public unsafe partial class CXXOperatorCallExpr : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 165)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -36378,7 +36459,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*)__Instance)->angleBrackets = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*)__Instance)->angleBrackets = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -36543,7 +36626,7 @@ namespace CppSharp
 
             public unsafe partial class CXXDynamicCastExpr : global::CppSharp.Parser.AST.CXXNamedCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 168)]
+                [StructLayout(LayoutKind.Explicit, Size = 161)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -37033,7 +37116,7 @@ namespace CppSharp
 
             public unsafe partial class UserDefinedLiteral : global::CppSharp.Parser.AST.CallExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 176)]
+                [StructLayout(LayoutKind.Explicit, Size = 172)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -37701,7 +37784,7 @@ namespace CppSharp
 
             public unsafe partial class CXXTypeidExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 90)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38247,7 +38330,7 @@ namespace CppSharp
 
             public unsafe partial class CXXUuidofExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 97)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38308,7 +38391,7 @@ namespace CppSharp
                     internal global::System.IntPtr exprOperand;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C uuidStr;
+                    internal global::Std.BasicString.__Internal uuidStr;
 
                     [FieldOffset(96)]
                     internal byte isTypeOperand;
@@ -38446,7 +38529,7 @@ namespace CppSharp
 
             public unsafe partial class CXXThisExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 81)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38600,7 +38683,7 @@ namespace CppSharp
 
             public unsafe partial class CXXThrowExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 93)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -38775,7 +38858,7 @@ namespace CppSharp
 
             public unsafe partial class CXXDefaultArgExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -39566,7 +39649,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXConstructExpr.__Internal*)__Instance)->parenOrBraceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXConstructExpr.__Internal*)__Instance)->parenOrBraceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -39765,7 +39850,7 @@ namespace CppSharp
 
             public unsafe partial class CXXFunctionalCastExpr : global::CppSharp.Parser.AST.ExplicitCastExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 145)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -40129,7 +40214,7 @@ namespace CppSharp
 
             public unsafe partial class LambdaExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 147)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -40378,7 +40463,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.LambdaExpr.__Internal*)__Instance)->introducerRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.LambdaExpr.__Internal*)__Instance)->introducerRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -40901,7 +40988,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->allocatedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->allocatedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -40971,7 +41060,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->typeIdParens = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->typeIdParens = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41059,7 +41150,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->directInitRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->directInitRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41296,14 +41389,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXDeleteExpr.__Internal*)__Instance)->destroyedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXDeleteExpr.__Internal*)__Instance)->destroyedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class CXXPseudoDestructorExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 128)]
+                [StructLayout(LayoutKind.Explicit, Size = 124)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -41538,7 +41633,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXPseudoDestructorExpr.__Internal*)__Instance)->destroyedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXPseudoDestructorExpr.__Internal*)__Instance)->destroyedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41849,7 +41946,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ArrayTypeTraitExpr.__Internal*)__Instance)->queriedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ArrayTypeTraitExpr.__Internal*)__Instance)->queriedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41887,7 +41986,7 @@ namespace CppSharp
 
             public unsafe partial class ExpressionTraitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 89)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -42403,7 +42502,7 @@ namespace CppSharp
 
             public unsafe partial class UnresolvedLookupExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 112)]
+                [StructLayout(LayoutKind.Explicit, Size = 106)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -42581,7 +42680,7 @@ namespace CppSharp
 
             public unsafe partial class DependentScopeDeclRefExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -42815,7 +42914,7 @@ namespace CppSharp
 
             public unsafe partial class ExprWithCleanups : global::CppSharp.Parser.AST.FullExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 93)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -43209,7 +43308,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXUnresolvedConstructExpr.__Internal*)__Instance)->typeAsWritten = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXUnresolvedConstructExpr.__Internal*)__Instance)->typeAsWritten = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43449,7 +43550,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXDependentScopeMemberExpr.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXDependentScopeMemberExpr.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43591,7 +43694,7 @@ namespace CppSharp
 
             public unsafe partial class UnresolvedMemberExpr : global::CppSharp.Parser.AST.OverloadExpr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 152)]
+                [StructLayout(LayoutKind.Explicit, Size = 148)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -43795,7 +43898,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnresolvedMemberExpr.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnresolvedMemberExpr.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43854,7 +43959,7 @@ namespace CppSharp
 
             public unsafe partial class CXXNoexceptExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 89)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -44013,7 +44118,7 @@ namespace CppSharp
 
             public unsafe partial class PackExpansionExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 96)]
+                [StructLayout(LayoutKind.Explicit, Size = 92)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -44172,7 +44277,7 @@ namespace CppSharp
 
             public unsafe partial class SizeOfPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 101)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -44701,14 +44806,16 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.SubstNonTypeTemplateParmPackExpr.__Internal*)__Instance)->argumentPack = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.TemplateArgument.__Internal() : *(global::CppSharp.Parser.AST.TemplateArgument.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.SubstNonTypeTemplateParmPackExpr.__Internal*)__Instance)->argumentPack = *(global::CppSharp.Parser.AST.TemplateArgument.__Internal*) value.__Instance;
                     }
                 }
             }
 
             public unsafe partial class FunctionParmPackExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 88)]
+                [StructLayout(LayoutKind.Explicit, Size = 84)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -44862,7 +44969,7 @@ namespace CppSharp
 
             public unsafe partial class MaterializeTemporaryExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 101)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -45864,7 +45971,7 @@ namespace CppSharp
 
             public unsafe partial class DependentCoawaitExpr : global::CppSharp.Parser.AST.Expr, IDisposable
             {
-                [StructLayout(LayoutKind.Explicit, Size = 104)]
+                [StructLayout(LayoutKind.Explicit, Size = 100)]
                 public new partial struct __Internal
                 {
                     [FieldOffset(0)]
@@ -46231,7 +46338,7 @@ namespace CppSharp
             public partial struct __Internal
             {
                 [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C ABI;
+                internal global::Std.BasicString.__Internal ABI;
 
                 [FieldOffset(8)]
                 internal global::CppSharp.Parser.ParserIntType char16Type;
@@ -47069,7 +47176,7 @@ namespace CppSharp
                 internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ Arguments;
 
                 [FieldOffset(24)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C libraryFile;
+                internal global::Std.BasicString.__Internal libraryFile;
 
                 [FieldOffset(32)]
                 internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ SourceFiles;
@@ -47099,10 +47206,10 @@ namespace CppSharp
                 internal int toolSetToUse;
 
                 [FieldOffset(216)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C targetTriple;
+                internal global::Std.BasicString.__Internal targetTriple;
 
                 [FieldOffset(224)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C currentDir;
+                internal global::Std.BasicString.__Internal currentDir;
 
                 [FieldOffset(232)]
                 internal byte noStandardIncludes;
@@ -47766,14 +47873,14 @@ namespace CppSharp
 
         public unsafe partial class ParserDiagnostic : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 32)]
+            [StructLayout(LayoutKind.Explicit, Size = 28)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C fileName;
+                internal global::Std.BasicString.__Internal fileName;
 
                 [FieldOffset(8)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C message;
+                internal global::Std.BasicString.__Internal message;
 
                 [FieldOffset(16)]
                 internal global::CppSharp.Parser.ParserDiagnosticLevel level;
@@ -48179,7 +48286,7 @@ namespace CppSharp
 
         public unsafe partial class ClangParser : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 0)]
+            [StructLayout(LayoutKind.Explicit, Size = 1)]
             public partial struct __Internal
             {
                 [SuppressUnmanagedCodeSecurity]
@@ -48303,7 +48410,7 @@ namespace Std
         public unsafe partial struct __Internalc__N_std_S_pair__1__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration
         {
             [FieldOffset(0)]
-            internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C first;
+            internal global::Std.BasicString.__Internal first;
 
             [FieldOffset(8)]
             internal global::System.IntPtr second;
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs
index 973efc57..dcab7390 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs
@@ -668,82 +668,13 @@ namespace Std
     }
 }
 
-namespace Std
-{
-    namespace Less
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 0)]
-        public unsafe partial struct __Internal
-        {
-        }
-    }
-}
-
-namespace Std
-{
-    public enum RbTreeColor : uint
-    {
-    }
-
-    namespace RbTree
-    {
-        namespace RbTreeImpl
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 48)]
-            public unsafe partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal global::Std.Less.__Internal _M_key_compare;
-
-                [FieldOffset(8)]
-                internal global::Std.RbTreeNodeBase.__Internal _M_header;
-
-                [FieldOffset(40)]
-                internal ulong _M_node_count;
-            }
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 48)]
-        public unsafe partial struct __Internalc__N_std_S__Rb_tree____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_pair__1S0_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S__Select1st__S3____N_std_S_less__S0____N_std_S_allocator__S3_
-        {
-            [FieldOffset(0)]
-            internal global::Std.RbTree.RbTreeImpl.__Internal _M_impl;
-        }
-    }
-
-    public unsafe partial class RbTreeNodeBase
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 32)]
-        public partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal global::Std.RbTreeColor _M_color;
-
-            [FieldOffset(8)]
-            internal global::System.IntPtr _M_parent;
-
-            [FieldOffset(16)]
-            internal global::System.IntPtr _M_left;
-
-            [FieldOffset(24)]
-            internal global::System.IntPtr _M_right;
-        }
-    }
-}
-
-namespace GnuCxx
-{
-}
-
 namespace Std
 {
     namespace Map
     {
         [StructLayout(LayoutKind.Explicit, Size = 48)]
-        public unsafe partial struct __Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_
+        public unsafe partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal global::Std.RbTree.__Internalc__N_std_S__Rb_tree____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_pair__1S0_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S__Select1st__S3____N_std_S_less__S0____N_std_S_allocator__S3_ _M_t;
         }
     }
 }
@@ -756,7 +687,7 @@ namespace Std
 {
     namespace CharTraits
     {
-        [StructLayout(LayoutKind.Explicit, Size = 0)]
+        [StructLayout(LayoutKind.Explicit, Size = 1)]
         public unsafe partial struct __Internal
         {
         }
@@ -826,11 +757,8 @@ namespace Std
     namespace BasicString
     {
         [StructLayout(LayoutKind.Explicit, Size = 8)]
-        public unsafe partial struct __Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C
+        public unsafe partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal global::Std.BasicString.AllocHider.__Internal _M_dataplus;
-
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                 EntryPoint="_ZNSsC2Ev")]
@@ -846,17 +774,6 @@ namespace Std
                 EntryPoint="_ZNKSs5c_strEv")]
             internal static extern global::System.IntPtr CStrc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr __instance);
         }
-
-        namespace AllocHider
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 8)]
-            public unsafe partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal global::System.IntPtr _M_p;
-            }
-        }
-
     }
 
     public unsafe partial class BasicString<_CharT, _Traits, _Alloc> : IDisposable
@@ -874,19 +791,19 @@ namespace Std
             return new global::Std.BasicString<_CharT, _Traits, _Alloc>(native.ToPointer(), skipVTables);
         }
 
-        internal static global::Std.BasicString<_CharT, _Traits, _Alloc> __CreateInstance(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native, bool skipVTables = false)
+        internal static global::Std.BasicString<_CharT, _Traits, _Alloc> __CreateInstance(global::Std.BasicString.__Internal native, bool skipVTables = false)
         {
             return new global::Std.BasicString<_CharT, _Traits, _Alloc>(native, skipVTables);
         }
 
-        private static void* __CopyValue(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native)
+        private static void* __CopyValue(global::Std.BasicString.__Internal native)
         {
-            var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
-            *(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C*) ret = native;
+            var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internal));
+            *(global::Std.BasicString.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
-        private BasicString(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native, bool skipVTables = false)
+        private BasicString(global::Std.BasicString.__Internal native, bool skipVTables = false)
             : this(__CopyValue(native), skipVTables)
         {
             __ownsNativeInstance = true;
@@ -907,10 +824,10 @@ namespace Std
             var ___Alloc = typeof(_Alloc);
             if (___CharT.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Alloc.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
             {
-                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
+                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internal));
                 __ownsNativeInstance = true;
                 NativeToManagedMap[__Instance] = this;
-                global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.ctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment));
+                global::Std.BasicString.__Internal.ctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment));
                 return;
             }
             throw new ArgumentOutOfRangeException("_CharT, _Traits, _Alloc", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_CharT, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
@@ -934,7 +851,7 @@ namespace Std
                 var ___Alloc = typeof(_Alloc);
                 if (___CharT.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Alloc.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
                 {
-                    global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.dtorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment));
+                    global::Std.BasicString.__Internal.dtorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment));
                     return;
                 }
                 throw new ArgumentOutOfRangeException("_CharT, _Traits, _Alloc", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_CharT, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
index c1f38fe8..23e4e74b 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
@@ -61,16 +61,16 @@ namespace CppSharp
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C fileName;
+                    internal global::Std.BasicString.__Internal fileName;
 
                     [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.ArchType archType;
 
                     [FieldOffset(40)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ Symbols;
+                    internal global::Std.Vector.__Internal Symbols;
 
                     [FieldOffset(64)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ Dependencies;
+                    internal global::Std.Vector.__Internal Dependencies;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -492,7 +492,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CommentKind kind;
 
                     [FieldOffset(8)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BlockContentComment___N_std_S_allocator__S0_ Blocks;
+                    internal global::Std.Vector.__Internal Blocks;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -749,7 +749,7 @@ namespace CppSharp
                     internal byte isWhitespace;
 
                     [FieldOffset(8)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_InlineContentComment___N_std_S_allocator__S0_ Content;
+                    internal global::Std.Vector.__Internal Content;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -916,7 +916,7 @@ namespace CppSharp
                     internal global::System.IntPtr paragraphComment;
 
                     [FieldOffset(16)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -965,7 +965,7 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                        internal global::Std.BasicString.__Internal text;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1233,7 +1233,7 @@ namespace CppSharp
                     internal global::System.IntPtr paragraphComment;
 
                     [FieldOffset(16)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(40)]
                     internal global::CppSharp.Parser.AST.ParamCommandComment.PassDirection direction;
@@ -1373,10 +1373,10 @@ namespace CppSharp
                     internal global::System.IntPtr paragraphComment;
 
                     [FieldOffset(16)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(40)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector__i___N_std_S_allocator__i Position;
+                    internal global::Std.Vector.__Internal Position;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1520,7 +1520,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CommentKind kind;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1637,10 +1637,10 @@ namespace CppSharp
                     internal global::System.IntPtr paragraphComment;
 
                     [FieldOffset(16)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(40)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VerbatimBlockLineComment___N_std_S_allocator__S0_ Lines;
+                    internal global::Std.Vector.__Internal Lines;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1794,10 +1794,10 @@ namespace CppSharp
                     internal global::System.IntPtr paragraphComment;
 
                     [FieldOffset(16)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1917,7 +1917,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.InlineCommandComment.RenderKind commentRenderKind;
 
                     [FieldOffset(16)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_InlineCommandComment_S_Argument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -1969,7 +1969,7 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                        internal global::Std.BasicString.__Internal text;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2308,10 +2308,10 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C tagName;
+                    internal global::Std.BasicString.__Internal tagName;
 
                     [FieldOffset(40)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_S_allocator__S0_ Attributes;
+                    internal global::Std.Vector.__Internal Attributes;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2355,10 +2355,10 @@ namespace CppSharp
                     public partial struct __Internal
                     {
                         [FieldOffset(0)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                        internal global::Std.BasicString.__Internal name;
 
                         [FieldOffset(32)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C value;
+                        internal global::Std.BasicString.__Internal value;
 
                         [SuppressUnmanagedCodeSecurity]
                         [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2610,7 +2610,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C tagName;
+                    internal global::Std.BasicString.__Internal tagName;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2724,7 +2724,7 @@ namespace CppSharp
                     internal byte hasTrailingNewline;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -2835,10 +2835,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.RawCommentKind kind;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C briefText;
+                    internal global::Std.BasicString.__Internal briefText;
 
                     [FieldOffset(72)]
                     internal global::System.IntPtr fullCommentBlock;
@@ -3675,7 +3675,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.QualifiedType.__Internal*)__Instance)->qualifiers = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.TypeQualifiers.__Internal() : *(global::CppSharp.Parser.AST.TypeQualifiers.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.QualifiedType.__Internal*)__Instance)->qualifiers = *(global::CppSharp.Parser.AST.TypeQualifiers.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -3883,7 +3885,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ArrayType.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ArrayType.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -3948,7 +3952,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.ExceptionSpecType exceptionSpecType;
 
                     [FieldOffset(32)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -4086,7 +4090,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.FunctionType.__Internal*)__Instance)->returnType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.FunctionType.__Internal*)__Instance)->returnType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4225,7 +4231,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.PointerType.__Internal*)__Instance)->qualifiedPointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.PointerType.__Internal*)__Instance)->qualifiedPointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4331,7 +4339,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.MemberPointerType.__Internal*)__Instance)->pointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.MemberPointerType.__Internal*)__Instance)->pointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4525,7 +4535,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->modified = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->modified = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4538,7 +4550,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->equivalent = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AttributedType.__Internal*)__Instance)->equivalent = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4637,7 +4651,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->decayed = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->decayed = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4650,7 +4666,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->original = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->original = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4663,7 +4681,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->pointee = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DecayedType.__Internal*)__Instance)->pointee = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -4801,7 +4821,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateArgument.__Internal*)__Instance)->type = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateArgument.__Internal*)__Instance)->type = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -4849,7 +4871,7 @@ namespace CppSharp
                     internal byte isDependent;
 
                     [FieldOffset(8)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(32)]
                     internal global::System.IntPtr _template;
@@ -5007,7 +5029,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateSpecializationType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateSpecializationType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5033,7 +5057,7 @@ namespace CppSharp
                     internal byte isDependent;
 
                     [FieldOffset(8)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal desugared;
@@ -5170,7 +5194,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DependentTemplateSpecializationType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DependentTemplateSpecializationType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5439,7 +5465,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TemplateParameterSubstitutionType.__Internal*)__Instance)->replacement = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TemplateParameterSubstitutionType.__Internal*)__Instance)->replacement = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5553,7 +5581,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.InjectedClassNameType.__Internal*)__Instance)->injectedSpecializationType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.InjectedClassNameType.__Internal*)__Instance)->injectedSpecializationType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5591,7 +5621,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifier;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C identifier;
+                    internal global::Std.BasicString.__Internal identifier;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -5685,7 +5715,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DependentNameType.__Internal*)__Instance)->qualifier = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DependentNameType.__Internal*)__Instance)->qualifier = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5874,7 +5906,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->desugared = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->desugared = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -5887,7 +5921,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryTransformType.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -5983,7 +6019,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.VectorType.__Internal*)__Instance)->elementType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.VectorType.__Internal*)__Instance)->elementType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -6316,13 +6354,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -6343,10 +6381,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -6843,13 +6881,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -6870,10 +6908,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -6882,34 +6920,34 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(248)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(272)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(296)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(320)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(344)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(368)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(392)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(416)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(456)]
                     internal byte isAnonymous;
@@ -7520,13 +7558,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -7547,10 +7585,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -7658,7 +7696,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TypedefNameDecl.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TypedefNameDecl.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -7690,13 +7730,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -7717,10 +7757,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -7842,13 +7882,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -7869,10 +7909,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -8015,13 +8055,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -8042,10 +8082,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -8170,7 +8210,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8329,7 +8369,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8432,7 +8472,7 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(48)]
                     internal global::System.IntPtr LHS;
@@ -8441,7 +8481,7 @@ namespace CppSharp
                     internal global::System.IntPtr RHS;
 
                     [FieldOffset(64)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8601,10 +8641,10 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(48)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8760,10 +8800,10 @@ namespace CppSharp
                     internal global::System.IntPtr decl;
 
                     [FieldOffset(16)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(48)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -8934,13 +8974,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -8961,10 +9001,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -9082,7 +9122,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Parameter.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Parameter.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9189,13 +9231,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -9216,10 +9258,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -9228,34 +9270,34 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(248)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(272)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(296)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(320)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(344)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(368)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(392)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(416)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(456)]
                     internal byte isAnonymous;
@@ -9294,13 +9336,13 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CXXOperatorKind operatorKind;
 
                     [FieldOffset(496)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(528)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C signature;
+                    internal global::Std.BasicString.__Internal signature;
 
                     [FieldOffset(560)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C body;
+                    internal global::Std.BasicString.__Internal body;
 
                     [FieldOffset(592)]
                     internal global::System.IntPtr bodyStmt;
@@ -9309,7 +9351,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CallingConvention callingConvention;
 
                     [FieldOffset(608)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [FieldOffset(632)]
                     internal global::System.IntPtr specializationInfo;
@@ -9456,7 +9498,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->returnType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->returnType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9714,7 +9758,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Function.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -9755,13 +9801,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -9782,10 +9828,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -9794,34 +9840,34 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(248)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(272)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(296)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(320)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(344)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(368)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(392)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(416)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(456)]
                     internal byte isAnonymous;
@@ -9860,13 +9906,13 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CXXOperatorKind operatorKind;
 
                     [FieldOffset(496)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(528)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C signature;
+                    internal global::Std.BasicString.__Internal signature;
 
                     [FieldOffset(560)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C body;
+                    internal global::Std.BasicString.__Internal body;
 
                     [FieldOffset(592)]
                     internal global::System.IntPtr bodyStmt;
@@ -9875,7 +9921,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.CallingConvention callingConvention;
 
                     [FieldOffset(608)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [FieldOffset(632)]
                     internal global::System.IntPtr specializationInfo;
@@ -9917,7 +9963,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.RefQualifierKind refQualifier;
 
                     [FieldOffset(704)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_S_allocator__S0_ OverriddenMethods;
+                    internal global::Std.Vector.__Internal OverriddenMethods;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -10159,7 +10205,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Method.__Internal*)__Instance)->conversionType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Method.__Internal*)__Instance)->conversionType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -10213,13 +10261,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -10240,10 +10288,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -10252,34 +10300,34 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(248)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(272)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(296)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(320)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(344)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(368)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(392)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(416)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(456)]
                     internal byte isAnonymous;
@@ -10294,7 +10342,7 @@ namespace CppSharp
                     internal global::System.IntPtr builtinType;
 
                     [FieldOffset(488)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration_S_Item___N_std_S_allocator__S0_ Items;
+                    internal global::Std.Vector.__Internal Items;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -10372,13 +10420,13 @@ namespace CppSharp
                         internal int lineNumberEnd;
 
                         [FieldOffset(40)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                        internal global::Std.BasicString.__Internal name;
 
                         [FieldOffset(72)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                        internal global::Std.BasicString.__Internal USR;
 
                         [FieldOffset(104)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                        internal global::Std.BasicString.__Internal debugText;
 
                         [FieldOffset(136)]
                         internal byte isIncomplete;
@@ -10399,10 +10447,10 @@ namespace CppSharp
                         internal uint definitionOrder;
 
                         [FieldOffset(160)]
-                        internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                        internal global::Std.Vector.__Internal PreprocessedEntities;
 
                         [FieldOffset(184)]
-                        internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                        internal global::Std.Vector.__Internal Redeclarations;
 
                         [FieldOffset(208)]
                         internal global::System.IntPtr originalPtr;
@@ -10411,7 +10459,7 @@ namespace CppSharp
                         internal global::System.IntPtr comment;
 
                         [FieldOffset(224)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C expression;
+                        internal global::Std.BasicString.__Internal expression;
 
                         [FieldOffset(256)]
                         internal ulong value;
@@ -10721,13 +10769,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -10748,10 +10796,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -10760,7 +10808,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(256)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -10873,7 +10921,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Variable.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Variable.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -11062,13 +11112,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -11089,10 +11139,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -11204,7 +11254,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Field.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Field.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -11280,13 +11332,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -11307,10 +11359,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -11549,7 +11601,7 @@ namespace CppSharp
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_VTableComponent___N_std_S_allocator__S0_ Components;
+                    internal global::Std.Vector.__Internal Components;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -11850,7 +11902,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.VFTableInfo.__Internal*)__Instance)->layout = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.VTableLayout.__Internal() : *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.VFTableInfo.__Internal*)__Instance)->layout = *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -11864,7 +11918,7 @@ namespace CppSharp
                     internal uint offset;
 
                     [FieldOffset(8)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(40)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -12002,7 +12056,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.LayoutField.__Internal*)__Instance)->qualifiedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.LayoutField.__Internal*)__Instance)->qualifiedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -12167,7 +12223,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.RecordArgABI argABI;
 
                     [FieldOffset(8)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_VFTableInfo___N_std_S_allocator__S0_ VFTables;
+                    internal global::Std.Vector.__Internal VFTables;
 
                     [FieldOffset(32)]
                     internal global::CppSharp.Parser.AST.VTableLayout.__Internal layout;
@@ -12188,10 +12244,10 @@ namespace CppSharp
                     internal int dataSize;
 
                     [FieldOffset(80)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutField___N_std_S_allocator__S0_ Fields;
+                    internal global::Std.Vector.__Internal Fields;
 
                     [FieldOffset(104)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutBase___N_std_S_allocator__S0_ Bases;
+                    internal global::Std.Vector.__Internal Bases;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -12440,7 +12496,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ClassLayout.__Internal*)__Instance)->layout = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.VTableLayout.__Internal() : *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ClassLayout.__Internal*)__Instance)->layout = *(global::CppSharp.Parser.AST.VTableLayout.__Internal*) value.__Instance;
                     }
                 }
 
@@ -12564,13 +12622,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -12591,10 +12649,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -12603,49 +12661,49 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(248)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(272)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(296)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(320)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(344)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(368)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(392)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(416)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(456)]
                     internal byte isAnonymous;
 
                     [FieldOffset(464)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_S_allocator__S0_ Bases;
+                    internal global::Std.Vector.__Internal Bases;
 
                     [FieldOffset(488)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_S_allocator__S0_ Fields;
+                    internal global::Std.Vector.__Internal Fields;
 
                     [FieldOffset(512)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_S_allocator__S0_ Methods;
+                    internal global::Std.Vector.__Internal Methods;
 
                     [FieldOffset(536)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_S_allocator__S0_ Specifiers;
+                    internal global::Std.Vector.__Internal Specifiers;
 
                     [FieldOffset(560)]
                     internal byte isPOD;
@@ -13151,13 +13209,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -13178,10 +13236,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -13193,7 +13251,7 @@ namespace CppSharp
                     internal global::System.IntPtr TemplatedDecl;
 
                     [FieldOffset(232)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -13396,13 +13454,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -13423,10 +13481,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -13438,7 +13496,7 @@ namespace CppSharp
                     internal global::System.IntPtr TemplatedDecl;
 
                     [FieldOffset(232)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -13551,13 +13609,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -13578,10 +13636,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -13753,13 +13811,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -13780,10 +13838,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -13795,7 +13853,7 @@ namespace CppSharp
                     internal global::System.IntPtr TemplatedDecl;
 
                     [FieldOffset(232)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [FieldOffset(256)]
                     internal byte isParameterPack;
@@ -13956,13 +14014,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -13983,10 +14041,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -14098,7 +14156,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.TypeTemplateParameter.__Internal*)__Instance)->defaultArgument = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.TypeTemplateParameter.__Internal*)__Instance)->defaultArgument = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -14130,13 +14190,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -14157,10 +14217,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -14378,13 +14438,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -14405,10 +14465,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -14420,10 +14480,10 @@ namespace CppSharp
                     internal global::System.IntPtr TemplatedDecl;
 
                     [FieldOffset(232)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [FieldOffset(256)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ClassTemplateSpecialization___N_std_S_allocator__S0_ Specializations;
+                    internal global::Std.Vector.__Internal Specializations;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -14629,13 +14689,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -14656,10 +14716,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -14668,49 +14728,49 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(248)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(272)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(296)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(320)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(344)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(368)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(392)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(416)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(456)]
                     internal byte isAnonymous;
 
                     [FieldOffset(464)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_S_allocator__S0_ Bases;
+                    internal global::Std.Vector.__Internal Bases;
 
                     [FieldOffset(488)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_S_allocator__S0_ Fields;
+                    internal global::Std.Vector.__Internal Fields;
 
                     [FieldOffset(512)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_S_allocator__S0_ Methods;
+                    internal global::Std.Vector.__Internal Methods;
 
                     [FieldOffset(536)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_S_allocator__S0_ Specifiers;
+                    internal global::Std.Vector.__Internal Specifiers;
 
                     [FieldOffset(560)]
                     internal byte isPOD;
@@ -14749,7 +14809,7 @@ namespace CppSharp
                     internal global::System.IntPtr templatedDecl;
 
                     [FieldOffset(592)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(616)]
                     internal global::CppSharp.Parser.AST.TemplateSpecializationKind specializationKind;
@@ -14945,13 +15005,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -14972,10 +15032,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -14984,49 +15044,49 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(248)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(272)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(296)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(320)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(344)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(368)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(392)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(416)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(456)]
                     internal byte isAnonymous;
 
                     [FieldOffset(464)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_S_allocator__S0_ Bases;
+                    internal global::Std.Vector.__Internal Bases;
 
                     [FieldOffset(488)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_S_allocator__S0_ Fields;
+                    internal global::Std.Vector.__Internal Fields;
 
                     [FieldOffset(512)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_S_allocator__S0_ Methods;
+                    internal global::Std.Vector.__Internal Methods;
 
                     [FieldOffset(536)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_S_allocator__S0_ Specifiers;
+                    internal global::Std.Vector.__Internal Specifiers;
 
                     [FieldOffset(560)]
                     internal byte isPOD;
@@ -15065,7 +15125,7 @@ namespace CppSharp
                     internal global::System.IntPtr templatedDecl;
 
                     [FieldOffset(592)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(616)]
                     internal global::CppSharp.Parser.AST.TemplateSpecializationKind specializationKind;
@@ -15181,13 +15241,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -15208,10 +15268,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -15223,10 +15283,10 @@ namespace CppSharp
                     internal global::System.IntPtr TemplatedDecl;
 
                     [FieldOffset(232)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [FieldOffset(256)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_FunctionTemplateSpecialization___N_std_S_allocator__S0_ Specializations;
+                    internal global::Std.Vector.__Internal Specializations;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -15394,7 +15454,7 @@ namespace CppSharp
                     internal global::System.IntPtr _template;
 
                     [FieldOffset(8)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(32)]
                     internal global::System.IntPtr specializedFunction;
@@ -15620,13 +15680,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -15647,10 +15707,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -15662,10 +15722,10 @@ namespace CppSharp
                     internal global::System.IntPtr TemplatedDecl;
 
                     [FieldOffset(232)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Parameters;
+                    internal global::Std.Vector.__Internal Parameters;
 
                     [FieldOffset(256)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VarTemplateSpecialization___N_std_S_allocator__S0_ Specializations;
+                    internal global::Std.Vector.__Internal Specializations;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -15871,13 +15931,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -15898,10 +15958,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -15910,7 +15970,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(256)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -15919,7 +15979,7 @@ namespace CppSharp
                     internal global::System.IntPtr templatedDecl;
 
                     [FieldOffset(280)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(304)]
                     internal global::CppSharp.Parser.AST.TemplateSpecializationKind specializationKind;
@@ -16115,13 +16175,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -16142,10 +16202,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -16154,7 +16214,7 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C mangled;
+                    internal global::Std.BasicString.__Internal mangled;
 
                     [FieldOffset(256)]
                     internal global::CppSharp.Parser.AST.QualifiedType.__Internal qualifiedType;
@@ -16163,7 +16223,7 @@ namespace CppSharp
                     internal global::System.IntPtr templatedDecl;
 
                     [FieldOffset(280)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_ Arguments;
+                    internal global::Std.Vector.__Internal Arguments;
 
                     [FieldOffset(304)]
                     internal global::CppSharp.Parser.AST.TemplateSpecializationKind specializationKind;
@@ -16279,13 +16339,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -16306,10 +16366,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -16318,34 +16378,34 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(248)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(272)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(296)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(320)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(344)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(368)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(392)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(416)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(456)]
                     internal byte isAnonymous;
@@ -16601,10 +16661,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.DeclarationKind kind;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C expression;
+                    internal global::Std.BasicString.__Internal expression;
 
                     [FieldOffset(88)]
                     internal int lineNumberStart;
@@ -16769,10 +16829,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.AST.DeclarationKind kind;
 
                     [FieldOffset(24)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(56)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C text;
+                    internal global::Std.BasicString.__Internal text;
 
                     [FieldOffset(88)]
                     internal global::System.IntPtr definition;
@@ -16938,13 +16998,13 @@ namespace CppSharp
                     internal int lineNumberEnd;
 
                     [FieldOffset(40)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C name;
+                    internal global::Std.BasicString.__Internal name;
 
                     [FieldOffset(72)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C USR;
+                    internal global::Std.BasicString.__Internal USR;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C debugText;
+                    internal global::Std.BasicString.__Internal debugText;
 
                     [FieldOffset(136)]
                     internal byte isIncomplete;
@@ -16965,10 +17025,10 @@ namespace CppSharp
                     internal uint definitionOrder;
 
                     [FieldOffset(160)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_ PreprocessedEntities;
+                    internal global::Std.Vector.__Internal PreprocessedEntities;
 
                     [FieldOffset(184)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ Redeclarations;
+                    internal global::Std.Vector.__Internal Redeclarations;
 
                     [FieldOffset(208)]
                     internal global::System.IntPtr originalPtr;
@@ -16977,34 +17037,34 @@ namespace CppSharp
                     internal global::System.IntPtr comment;
 
                     [FieldOffset(224)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_ Namespaces;
+                    internal global::Std.Vector.__Internal Namespaces;
 
                     [FieldOffset(248)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_ Enums;
+                    internal global::Std.Vector.__Internal Enums;
 
                     [FieldOffset(272)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_ Functions;
+                    internal global::Std.Vector.__Internal Functions;
 
                     [FieldOffset(296)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_ Classes;
+                    internal global::Std.Vector.__Internal Classes;
 
                     [FieldOffset(320)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_ Templates;
+                    internal global::Std.Vector.__Internal Templates;
 
                     [FieldOffset(344)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_ Typedefs;
+                    internal global::Std.Vector.__Internal Typedefs;
 
                     [FieldOffset(368)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_ TypeAliases;
+                    internal global::Std.Vector.__Internal TypeAliases;
 
                     [FieldOffset(392)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_ Variables;
+                    internal global::Std.Vector.__Internal Variables;
 
                     [FieldOffset(416)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_ Friends;
+                    internal global::Std.Vector.__Internal Friends;
 
                     [FieldOffset(440)]
-                    internal global::Std.Map.__Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_ anonymous;
+                    internal global::Std.Map.__Internal anonymous;
 
                     [FieldOffset(456)]
                     internal byte isAnonymous;
@@ -17013,13 +17073,13 @@ namespace CppSharp
                     internal byte isInline;
 
                     [FieldOffset(472)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C fileName;
+                    internal global::Std.BasicString.__Internal fileName;
 
                     [FieldOffset(504)]
                     internal byte isSystemHeader;
 
                     [FieldOffset(512)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_MacroDefinition___N_std_S_allocator__S0_ Macros;
+                    internal global::Std.Vector.__Internal Macros;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -17193,7 +17253,7 @@ namespace CppSharp
                 public partial struct __Internal
                 {
                     [FieldOffset(0)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TranslationUnit___N_std_S_allocator__S0_ TranslationUnits;
+                    internal global::Std.Vector.__Internal TranslationUnits;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -17213,7 +17273,7 @@ namespace CppSharp
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                         EntryPoint="?FindOrCreateModule@ASTContext@AST@CppParser@CppSharp@@QEAAPEAVTranslationUnit@234@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z")]
-                    internal static extern global::System.IntPtr FindOrCreateModule(global::System.IntPtr __instance, global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C File);
+                    internal static extern global::System.IntPtr FindOrCreateModule(global::System.IntPtr __instance, global::System.IntPtr File);
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -17316,9 +17376,8 @@ namespace CppSharp
                 {
                     var __basicString0 = new global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>();
                     global::Std.BasicStringExtensions.Assign(__basicString0, File);
-                    var __arg0 = *(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C*) __basicString0.__Instance;
+                    var __arg0 = __basicString0.__Instance;
                     var __ret = __Internal.FindOrCreateModule((__Instance + __PointerAdjustment), __arg0);
-                    __basicString0.Dispose(false);
                     global::CppSharp.Parser.AST.TranslationUnit __result0;
                     if (__ret == IntPtr.Zero) __result0 = null;
                     else if (global::CppSharp.Parser.AST.TranslationUnit.NativeToManagedMap.ContainsKey(__ret))
@@ -17639,7 +17698,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->sourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Stmt.__Internal*)__Instance)->sourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -17688,7 +17749,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_ decls;
+                    internal global::Std.Vector.__Internal decls;
 
                     [FieldOffset(48)]
                     internal byte isSingleDecl;
@@ -17994,7 +18055,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_S_allocator__S0_ body;
+                    internal global::Std.Vector.__Internal body;
 
                     [FieldOffset(48)]
                     internal byte body_empty;
@@ -20600,10 +20661,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
+                    internal global::Std.Vector.__Internal inputs;
 
                     [FieldOffset(48)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
+                    internal global::Std.Vector.__Internal outputs;
 
                     [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
@@ -20944,10 +21005,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
+                    internal global::Std.Vector.__Internal inputs;
 
                     [FieldOffset(48)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
+                    internal global::Std.Vector.__Internal outputs;
 
                     [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
@@ -21001,7 +21062,7 @@ namespace CppSharp
                         internal byte isOperand;
 
                         [FieldOffset(8)]
-                        internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                        internal global::Std.BasicString.__Internal @string;
 
                         [FieldOffset(40)]
                         internal uint operandNo;
@@ -21275,10 +21336,10 @@ namespace CppSharp
                     internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ inputs;
+                    internal global::Std.Vector.__Internal inputs;
 
                     [FieldOffset(48)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ outputs;
+                    internal global::Std.Vector.__Internal outputs;
 
                     [FieldOffset(72)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal asmLoc;
@@ -21311,7 +21372,7 @@ namespace CppSharp
                     internal uint numAsmToks;
 
                     [FieldOffset(112)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C asmString;
+                    internal global::Std.BasicString.__Internal asmString;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
@@ -22017,7 +22078,7 @@ namespace CppSharp
                     internal global::CppSharp.Parser.SourceLocation.__Internal endLoc;
 
                     [FieldOffset(24)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ capture_inits;
+                    internal global::Std.Vector.__Internal capture_inits;
 
                     [FieldOffset(48)]
                     internal global::System.IntPtr capturedStmt;
@@ -22495,7 +22556,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXCatchStmt.__Internal*)__Instance)->caughtType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXCatchStmt.__Internal*)__Instance)->caughtType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -24400,7 +24463,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.Expr.__Internal*)__Instance)->type = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.Expr.__Internal*)__Instance)->type = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -26225,10 +26290,10 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(80)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C @string;
+                    internal global::Std.BasicString.__Internal @string;
 
                     [FieldOffset(112)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C bytes;
+                    internal global::Std.BasicString.__Internal bytes;
 
                     [FieldOffset(144)]
                     internal uint byteLength;
@@ -27580,7 +27645,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->argumentType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->argumentType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -27611,7 +27678,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->typeOfArgument = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnaryExprOrTypeTraitExpr.__Internal*)__Instance)->typeOfArgument = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -27898,7 +27967,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(80)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(104)]
                     internal global::System.IntPtr callee;
@@ -29314,7 +29383,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*)__Instance)->typeAsWritten = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ExplicitCastExpr.__Internal*)__Instance)->typeAsWritten = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -29569,7 +29640,7 @@ namespace CppSharp
                     internal global::System.IntPtr rHS;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [FieldOffset(136)]
                     internal byte isPtrMemOp;
@@ -30048,7 +30119,7 @@ namespace CppSharp
                     internal global::System.IntPtr rHS;
 
                     [FieldOffset(104)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C opcodeStr;
+                    internal global::Std.BasicString.__Internal opcodeStr;
 
                     [FieldOffset(136)]
                     internal byte isPtrMemOp;
@@ -30190,7 +30261,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationLHSType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationLHSType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -30203,7 +30276,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationResultType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CompoundAssignOperator.__Internal*)__Instance)->computationResultType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -32756,7 +32831,9 @@ namespace CppSharp
 
                         set
                         {
-                            ((global::CppSharp.Parser.AST.DesignatedInitExpr.Designator.__Internal*)__Instance)->sourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                            if (ReferenceEquals(value, null))
+                                throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                            ((global::CppSharp.Parser.AST.DesignatedInitExpr.Designator.__Internal*)__Instance)->sourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                         }
                     }
                 }
@@ -33067,7 +33144,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.DesignatedInitExpr.__Internal*)__Instance)->designatorsSourceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.DesignatedInitExpr.__Internal*)__Instance)->designatorsSourceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -35284,7 +35363,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.AtomicExpr.__Internal*)__Instance)->valueType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.AtomicExpr.__Internal*)__Instance)->valueType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -35562,7 +35643,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(80)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(104)]
                     internal global::System.IntPtr callee;
@@ -35812,7 +35893,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(80)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(104)]
                     internal global::System.IntPtr callee;
@@ -36024,7 +36105,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(80)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(104)]
                     internal global::System.IntPtr callee;
@@ -36379,7 +36460,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*)__Instance)->angleBrackets = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*)__Instance)->angleBrackets = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -37092,7 +37175,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(80)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(104)]
                     internal global::System.IntPtr callee;
@@ -38309,7 +38392,7 @@ namespace CppSharp
                     internal global::System.IntPtr exprOperand;
 
                     [FieldOffset(88)]
-                    internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C uuidStr;
+                    internal global::Std.BasicString.__Internal uuidStr;
 
                     [FieldOffset(120)]
                     internal byte isTypeOperand;
@@ -39300,7 +39383,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(80)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
@@ -39567,7 +39650,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXConstructExpr.__Internal*)__Instance)->parenOrBraceRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXConstructExpr.__Internal*)__Instance)->parenOrBraceRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -40018,7 +40103,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(80)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal location;
@@ -40188,7 +40273,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(80)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ capture_inits;
+                    internal global::Std.Vector.__Internal capture_inits;
 
                     [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal captureDefaultLoc;
@@ -40379,7 +40464,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.LambdaExpr.__Internal*)__Instance)->introducerRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.LambdaExpr.__Internal*)__Instance)->introducerRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -40679,7 +40766,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(80)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ placement_arguments;
+                    internal global::Std.Vector.__Internal placement_arguments;
 
                     [FieldOffset(104)]
                     internal global::System.IntPtr operatorNew;
@@ -40902,7 +40989,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->allocatedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->allocatedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -40972,7 +41061,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->typeIdParens = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->typeIdParens = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41060,7 +41151,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->directInitRange = ReferenceEquals(value, null) ? new global::CppSharp.Parser.SourceRange.__Internal() : *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXNewExpr.__Internal*)__Instance)->directInitRange = *(global::CppSharp.Parser.SourceRange.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41297,7 +41390,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXDeleteExpr.__Internal*)__Instance)->destroyedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXDeleteExpr.__Internal*)__Instance)->destroyedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -41539,7 +41634,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXPseudoDestructorExpr.__Internal*)__Instance)->destroyedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXPseudoDestructorExpr.__Internal*)__Instance)->destroyedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -41850,7 +41947,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.ArrayTypeTraitExpr.__Internal*)__Instance)->queriedType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.ArrayTypeTraitExpr.__Internal*)__Instance)->queriedType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43031,7 +43130,7 @@ namespace CppSharp
                     internal byte hasPlaceholderType;
 
                     [FieldOffset(80)]
-                    internal global::Std.Vector.__Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_ arguments;
+                    internal global::Std.Vector.__Internal arguments;
 
                     [FieldOffset(104)]
                     internal global::CppSharp.Parser.SourceLocation.__Internal lParenLoc;
@@ -43210,7 +43309,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXUnresolvedConstructExpr.__Internal*)__Instance)->typeAsWritten = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXUnresolvedConstructExpr.__Internal*)__Instance)->typeAsWritten = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43450,7 +43551,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.CXXDependentScopeMemberExpr.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.CXXDependentScopeMemberExpr.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -43796,7 +43899,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.UnresolvedMemberExpr.__Internal*)__Instance)->baseType = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.QualifiedType.__Internal() : *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.UnresolvedMemberExpr.__Internal*)__Instance)->baseType = *(global::CppSharp.Parser.AST.QualifiedType.__Internal*) value.__Instance;
                     }
                 }
 
@@ -44702,7 +44807,9 @@ namespace CppSharp
 
                     set
                     {
-                        ((global::CppSharp.Parser.AST.SubstNonTypeTemplateParmPackExpr.__Internal*)__Instance)->argumentPack = ReferenceEquals(value, null) ? new global::CppSharp.Parser.AST.TemplateArgument.__Internal() : *(global::CppSharp.Parser.AST.TemplateArgument.__Internal*) value.__Instance;
+                        if (ReferenceEquals(value, null))
+                            throw new global::System.ArgumentNullException("value", "Cannot be null because it is passed by value.");
+                        ((global::CppSharp.Parser.AST.SubstNonTypeTemplateParmPackExpr.__Internal*)__Instance)->argumentPack = *(global::CppSharp.Parser.AST.TemplateArgument.__Internal*) value.__Instance;
                     }
                 }
             }
@@ -46232,7 +46339,7 @@ namespace CppSharp
             public partial struct __Internal
             {
                 [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C ABI;
+                internal global::Std.BasicString.__Internal ABI;
 
                 [FieldOffset(32)]
                 internal global::CppSharp.Parser.ParserIntType char16Type;
@@ -47067,31 +47174,31 @@ namespace CppSharp
             public partial struct __Internal
             {
                 [FieldOffset(0)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ Arguments;
+                internal global::Std.Vector.__Internal Arguments;
 
                 [FieldOffset(24)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C libraryFile;
+                internal global::Std.BasicString.__Internal libraryFile;
 
                 [FieldOffset(56)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ SourceFiles;
+                internal global::Std.Vector.__Internal SourceFiles;
 
                 [FieldOffset(80)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ IncludeDirs;
+                internal global::Std.Vector.__Internal IncludeDirs;
 
                 [FieldOffset(104)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ SystemIncludeDirs;
+                internal global::Std.Vector.__Internal SystemIncludeDirs;
 
                 [FieldOffset(128)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ Defines;
+                internal global::Std.Vector.__Internal Defines;
 
                 [FieldOffset(152)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ Undefines;
+                internal global::Std.Vector.__Internal Undefines;
 
                 [FieldOffset(176)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ LibraryDirs;
+                internal global::Std.Vector.__Internal LibraryDirs;
 
                 [FieldOffset(200)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_ SupportedStdTypes;
+                internal global::Std.Vector.__Internal SupportedStdTypes;
 
                 [FieldOffset(224)]
                 internal global::System.IntPtr ASTContext;
@@ -47100,10 +47207,10 @@ namespace CppSharp
                 internal int toolSetToUse;
 
                 [FieldOffset(240)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C targetTriple;
+                internal global::Std.BasicString.__Internal targetTriple;
 
                 [FieldOffset(272)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C currentDir;
+                internal global::Std.BasicString.__Internal currentDir;
 
                 [FieldOffset(304)]
                 internal byte noStandardIncludes;
@@ -47771,10 +47878,10 @@ namespace CppSharp
             public partial struct __Internal
             {
                 [FieldOffset(0)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C fileName;
+                internal global::Std.BasicString.__Internal fileName;
 
                 [FieldOffset(32)]
-                internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C message;
+                internal global::Std.BasicString.__Internal message;
 
                 [FieldOffset(64)]
                 internal global::CppSharp.Parser.ParserDiagnosticLevel level;
@@ -47958,7 +48065,7 @@ namespace CppSharp
                 internal global::CppSharp.Parser.ParserResultKind kind;
 
                 [FieldOffset(8)]
-                internal global::Std.Vector.__Internalc__N_std_S_vector____N_CppSharp_N_CppParser_S_ParserDiagnostic___N_std_S_allocator__S0_ Diagnostics;
+                internal global::Std.Vector.__Internal Diagnostics;
 
                 [FieldOffset(32)]
                 internal global::System.IntPtr library;
@@ -48298,13 +48405,13 @@ namespace CppSharp
 
 namespace Std
 {
-    namespace Pair
+    namespace pair
     {
         [StructLayout(LayoutKind.Explicit, Size = 40)]
         public unsafe partial struct __Internalc__N_std_S_pair__1__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration
         {
             [FieldOffset(0)]
-            internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C first;
+            internal global::Std.BasicString.__Internal first;
 
             [FieldOffset(32)]
             internal global::System.IntPtr second;
diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
index 5f7d22d9..b69f7c8f 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
@@ -82,310 +82,6 @@ namespace Std
     }
 }
 
-namespace Std
-{
-}
-
-namespace Std
-{
-    namespace CompressedPair
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 32)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator__C___N_std_S__String_val____N_std_S__Simple_types__C_Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.StringVal.__Internalc__N_std_S__String_val____N_std_S__Simple_types__C _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_BlockContentComment___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 16)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_less____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S__Compressed_pair____N_std_S_allocator____N_std_S__Tree_node____N_std_S_pair__1S1_____N_CppSharp_N_CppParser_N_AST_S_Declaration__v___N_std_S__Tree_val____N_std_S__Tree_simple_types__S7__Vb1_Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_std_S__Tree_node____N_std_S_pair__1__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration__v___N_std_S__Tree_val____N_std_S__Tree_simple_types__S2__Vb1 _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 16)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_std_S__Tree_node____N_std_S_pair__1__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration__v___N_std_S__Tree_val____N_std_S__Tree_simple_types__S2__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.TreeVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_FunctionTemplateSpecialization___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_VTableComponent___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_VFTableInfo___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_LayoutField___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_LayoutBase___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Enumeration_S_Item___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_ClassTemplateSpecialization___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_VarTemplateSpecialization___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_MacroDefinition___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_TranslationUnit___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_InlineContentComment___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator__i___N_std_S__Vector_val____N_std_S__Simple_types__i_Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_VerbatimBlockLineComment___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_InlineCommandComment_S_Argument___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_S_ParserDiagnostic___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1
-        {
-            [FieldOffset(0)]
-            internal global::Std.VectorVal.__Internal _Myval2;
-        }
-    }
-}
-
 namespace Std
 {
     namespace Allocator
@@ -460,11 +156,8 @@ namespace Std
     namespace BasicString
     {
         [StructLayout(LayoutKind.Explicit, Size = 32)]
-        public unsafe partial struct __Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C
+        public unsafe partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator__C___N_std_S__String_val____N_std_S__Simple_types__C_Vb1 _Mypair;
-
             [SuppressUnmanagedCodeSecurity]
             [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                 EntryPoint="??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ")]
@@ -497,19 +190,19 @@ namespace Std
             return new global::Std.BasicString<_Elem, _Traits, _Alloc>(native.ToPointer(), skipVTables);
         }
 
-        internal static global::Std.BasicString<_Elem, _Traits, _Alloc> __CreateInstance(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native, bool skipVTables = false)
+        internal static global::Std.BasicString<_Elem, _Traits, _Alloc> __CreateInstance(global::Std.BasicString.__Internal native, bool skipVTables = false)
         {
             return new global::Std.BasicString<_Elem, _Traits, _Alloc>(native, skipVTables);
         }
 
-        private static void* __CopyValue(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native)
+        private static void* __CopyValue(global::Std.BasicString.__Internal native)
         {
-            var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
-            *(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C*) ret = native;
+            var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internal));
+            *(global::Std.BasicString.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
-        private BasicString(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C native, bool skipVTables = false)
+        private BasicString(global::Std.BasicString.__Internal native, bool skipVTables = false)
             : this(__CopyValue(native), skipVTables)
         {
             __ownsNativeInstance = true;
@@ -530,10 +223,10 @@ namespace Std
             var ___Alloc = typeof(_Alloc);
             if (___Elem.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Alloc.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
             {
-                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C));
+                __Instance = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internal));
                 __ownsNativeInstance = true;
                 NativeToManagedMap[__Instance] = this;
-                global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.ctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment));
+                global::Std.BasicString.__Internal.ctorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment));
                 return;
             }
             throw new ArgumentOutOfRangeException("_Elem, _Traits, _Alloc", string.Join(", ", new[] { typeof(_Elem).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_Elem, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
@@ -557,7 +250,7 @@ namespace Std
                 var ___Alloc = typeof(_Alloc);
                 if (___Elem.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Alloc.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
                 {
-                    global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C.dtorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment), 0);
+                    global::Std.BasicString.__Internal.dtorc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment), 0);
                     return;
                 }
                 throw new ArgumentOutOfRangeException("_Elem, _Traits, _Alloc", string.Join(", ", new[] { typeof(_Elem).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_Elem, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
@@ -580,39 +273,6 @@ namespace Std
         }
     }
 
-    namespace StringVal
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 32)]
-        public unsafe partial struct __Internalc__N_std_S__String_val____N_std_S__Simple_types__C
-        {
-            [FieldOffset(0)]
-            internal global::Std.StringVal.Bxty.__Internal _Bx;
-
-            [FieldOffset(16)]
-            internal ulong _Mysize;
-
-            [FieldOffset(24)]
-            internal ulong _Myres;
-        }
-
-        namespace Bxty
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 16)]
-            public unsafe partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal fixed sbyte _Buf[16];
-
-                [FieldOffset(0)]
-                internal global::System.IntPtr _Ptr;
-
-                [FieldOffset(0)]
-                internal fixed sbyte _Alias[16];
-            }
-        }
-
-    }
-
     public unsafe static partial class BasicStringExtensions
     {
         [StructLayout(LayoutKind.Explicit, Size = 0)]
@@ -655,308 +315,8 @@ namespace Std
     namespace Vector
     {
         [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BlockContentComment___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_BlockContentComment___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Namespace___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Enumeration___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Function___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Class___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Template___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_TypedefDecl___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_TypeAlias___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Variable___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Friend___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_BaseClassSpecifier___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Field___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Method___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Parameter___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_FunctionTemplateSpecialization___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_FunctionTemplateSpecialization___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_TemplateArgument___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_AccessSpecifierDecl___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_VFTableInfo___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_VFTableInfo___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_VTableComponent___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_VTableComponent___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutField___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_LayoutField___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_LayoutBase___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_LayoutBase___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Enumeration_S_Item___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Enumeration_S_Item___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ClassTemplateSpecialization___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_ClassTemplateSpecialization___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_ExpressionObsolete___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VarTemplateSpecialization___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_VarTemplateSpecialization___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_MacroDefinition___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_MacroDefinition___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_TranslationUnit___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_TranslationUnit___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Stmt___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_Expr___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_InlineContentComment___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_InlineContentComment___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_BlockCommandComment_S_Argument___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector__i___N_std_S_allocator__i
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator__i___N_std_S__Vector_val____N_std_S__Simple_types__i_Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector_____N_CppSharp_N_CppParser_N_AST_S_VerbatimBlockLineComment___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_VerbatimBlockLineComment___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_InlineCommandComment_S_Argument___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_InlineCommandComment_S_Argument___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_N_AST_S_HTMLStartTagComment_S_Attribute___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internalc__N_std_S_vector____N_CppSharp_N_CppParser_S_ParserDiagnostic___N_std_S_allocator__S0_
-        {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator____N_CppSharp_N_CppParser_S_ParserDiagnostic___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
-        }
-    }
-
-    namespace VectorVal
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal global::System.IntPtr _Myfirst;
-
-            [FieldOffset(8)]
-            internal global::System.IntPtr _Mylast;
-
-            [FieldOffset(16)]
-            internal global::System.IntPtr _Myend;
-        }
-    }
-}
-
-namespace Std
-{
-    namespace TreeVal
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 16)]
         public unsafe partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal global::System.IntPtr _Myhead;
-
-            [FieldOffset(8)]
-            internal ulong _Mysize;
         }
     }
 }
@@ -966,10 +326,8 @@ namespace Std
     namespace Map
     {
         [StructLayout(LayoutKind.Explicit, Size = 16)]
-        public unsafe partial struct __Internalc__N_std_S_map____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C____N_CppSharp_N_CppParser_N_AST_S_Declaration___N_std_S_less__S0____N_std_S_allocator____N_std_S_pair__1S0__S3_
+        public unsafe partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_less____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S__Compressed_pair____N_std_S_allocator____N_std_S__Tree_node____N_std_S_pair__1S1_____N_CppSharp_N_CppParser_N_AST_S_Declaration__v___N_std_S__Tree_val____N_std_S__Tree_simple_types__S7__Vb1_Vb1 _Mypair;
         }
     }
 }