From 079acc028df47ac8d16acc5a8d34e9b281d4a451 Mon Sep 17 00:00:00 2001
From: Cybel Gibson <self@cybel.ml>
Date: Wed, 29 Nov 2017 17:52:01 +0000
Subject: [PATCH] Revert gtest modifications

NoneType -> None
---
 .../googletest/include/gtest/gtest.h          |   2 +-
 .../include/gtest/internal/gtest-internal.h   |   2 +-
 .../include/gtest/internal/gtest-type-util.h  | 764 +++++++++---------
 .../gtest/internal/gtest-type-util.h.pump     |  10 +-
 test/gtest-1.8.0/googletest/src/gtest.cc      |   2 +-
 .../googletest/test/gtest_repeat_test.cc      |   2 +-
 6 files changed, 391 insertions(+), 391 deletions(-)

diff --git a/test/gtest-1.8.0/googletest/include/gtest/gtest.h b/test/gtest-1.8.0/googletest/include/gtest/gtest.h
index a7dfd88..f846c5b 100644
--- a/test/gtest-1.8.0/googletest/include/gtest/gtest.h
+++ b/test/gtest-1.8.0/googletest/include/gtest/gtest.h
@@ -103,7 +103,7 @@ GTEST_DECLARE_string_(color);
 // the tests to run. If the filter is not given all tests are executed.
 GTEST_DECLARE_string_(filter);
 
-// This flag causes the Google Test to list tests. NoneType of the tests listed
+// This flag causes the Google Test to list tests. None of the tests listed
 // are actually run if the flag is provided.
 GTEST_DECLARE_bool_(list_tests);
 
diff --git a/test/gtest-1.8.0/googletest/include/gtest/internal/gtest-internal.h b/test/gtest-1.8.0/googletest/include/gtest/internal/gtest-internal.h
index 6182de5..ebd1cf6 100644
--- a/test/gtest-1.8.0/googletest/include/gtest/internal/gtest-internal.h
+++ b/test/gtest-1.8.0/googletest/include/gtest/internal/gtest-internal.h
@@ -539,7 +539,7 @@ GTEST_API_ TestInfo* MakeAndRegisterTestInfo(
 
 // If *pstr starts with the given prefix, modifies *pstr to be right
 // past the prefix and returns true; otherwise leaves *pstr unchanged
-// and returns false.  NoneType of pstr, *pstr, and prefix can be NULL.
+// and returns false.  None of pstr, *pstr, and prefix can be NULL.
 GTEST_API_ bool SkipPrefix(const char* prefix, const char** pstr);
 
 #if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
diff --git a/test/gtest-1.8.0/googletest/include/gtest/internal/gtest-type-util.h b/test/gtest-1.8.0/googletest/include/gtest/internal/gtest-type-util.h
index 64db3d9..e46f7cf 100644
--- a/test/gtest-1.8.0/googletest/include/gtest/internal/gtest-type-util.h
+++ b/test/gtest-1.8.0/googletest/include/gtest/internal/gtest-type-util.h
@@ -105,7 +105,7 @@ struct AssertTypeEq<T, T> {
 // template Types.  This allows us to simulate variadic templates
 // (e.g. Types<int>, Type<int, double>, and etc), which C++ doesn't
 // support directly.
-struct NoneType {};
+struct None {};
 
 // The following family of struct and struct templates are used to
 // represent type lists.  In particular, TypesN<T1, T2, ..., TN>
@@ -717,7 +717,7 @@ struct Types50 {
 // easier to write, but generates horrible messages when there is a
 // compiler error, as gcc insists on printing out each template
 // argument, even if it has the default value (this means Types<int>
-// will appear as Types<int, NoneType, None, ..., NoneType> in the compiler
+// will appear as Types<int, None, None, ..., None> in the compiler
 // errors).
 //
 // Our solution is to combine the best part of the two approaches: a
@@ -725,31 +725,31 @@ struct Types50 {
 // that to TypesN<T1, ..., TN> internally to make error messages
 // readable.  The translation is done by the 'type' member of the
 // Types template.
-template <typename T1 = internal::NoneType, typename T2 = internal::NoneType,
-    typename T3 = internal::NoneType, typename T4 = internal::NoneType,
-    typename T5 = internal::NoneType, typename T6 = internal::NoneType,
-    typename T7 = internal::NoneType, typename T8 = internal::NoneType,
-    typename T9 = internal::NoneType, typename T10 = internal::NoneType,
-    typename T11 = internal::NoneType, typename T12 = internal::NoneType,
-    typename T13 = internal::NoneType, typename T14 = internal::NoneType,
-    typename T15 = internal::NoneType, typename T16 = internal::NoneType,
-    typename T17 = internal::NoneType, typename T18 = internal::NoneType,
-    typename T19 = internal::NoneType, typename T20 = internal::NoneType,
-    typename T21 = internal::NoneType, typename T22 = internal::NoneType,
-    typename T23 = internal::NoneType, typename T24 = internal::NoneType,
-    typename T25 = internal::NoneType, typename T26 = internal::NoneType,
-    typename T27 = internal::NoneType, typename T28 = internal::NoneType,
-    typename T29 = internal::NoneType, typename T30 = internal::NoneType,
-    typename T31 = internal::NoneType, typename T32 = internal::NoneType,
-    typename T33 = internal::NoneType, typename T34 = internal::NoneType,
-    typename T35 = internal::NoneType, typename T36 = internal::NoneType,
-    typename T37 = internal::NoneType, typename T38 = internal::NoneType,
-    typename T39 = internal::NoneType, typename T40 = internal::NoneType,
-    typename T41 = internal::NoneType, typename T42 = internal::NoneType,
-    typename T43 = internal::NoneType, typename T44 = internal::NoneType,
-    typename T45 = internal::NoneType, typename T46 = internal::NoneType,
-    typename T47 = internal::NoneType, typename T48 = internal::NoneType,
-    typename T49 = internal::NoneType, typename T50 = internal::NoneType>
+template <typename T1 = internal::None, typename T2 = internal::None,
+    typename T3 = internal::None, typename T4 = internal::None,
+    typename T5 = internal::None, typename T6 = internal::None,
+    typename T7 = internal::None, typename T8 = internal::None,
+    typename T9 = internal::None, typename T10 = internal::None,
+    typename T11 = internal::None, typename T12 = internal::None,
+    typename T13 = internal::None, typename T14 = internal::None,
+    typename T15 = internal::None, typename T16 = internal::None,
+    typename T17 = internal::None, typename T18 = internal::None,
+    typename T19 = internal::None, typename T20 = internal::None,
+    typename T21 = internal::None, typename T22 = internal::None,
+    typename T23 = internal::None, typename T24 = internal::None,
+    typename T25 = internal::None, typename T26 = internal::None,
+    typename T27 = internal::None, typename T28 = internal::None,
+    typename T29 = internal::None, typename T30 = internal::None,
+    typename T31 = internal::None, typename T32 = internal::None,
+    typename T33 = internal::None, typename T34 = internal::None,
+    typename T35 = internal::None, typename T36 = internal::None,
+    typename T37 = internal::None, typename T38 = internal::None,
+    typename T39 = internal::None, typename T40 = internal::None,
+    typename T41 = internal::None, typename T42 = internal::None,
+    typename T43 = internal::None, typename T44 = internal::None,
+    typename T45 = internal::None, typename T46 = internal::None,
+    typename T47 = internal::None, typename T48 = internal::None,
+    typename T49 = internal::None, typename T50 = internal::None>
 struct Types {
   typedef internal::Types50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
@@ -758,205 +758,205 @@ struct Types {
 };
 
 template <>
-struct Types<internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType> {
+struct Types<internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
   typedef internal::Types0 type;
 };
 template <typename T1>
-struct Types<T1, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType> {
+struct Types<T1, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
   typedef internal::Types1<T1> type;
 };
 template <typename T1, typename T2>
-struct Types<T1, T2, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType> {
+struct Types<T1, T2, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
   typedef internal::Types2<T1, T2> type;
 };
 template <typename T1, typename T2, typename T3>
-struct Types<T1, T2, T3, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType> {
+struct Types<T1, T2, T3, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
   typedef internal::Types3<T1, T2, T3> type;
 };
 template <typename T1, typename T2, typename T3, typename T4>
-struct Types<T1, T2, T3, T4, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType> {
+struct Types<T1, T2, T3, T4, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
   typedef internal::Types4<T1, T2, T3, T4> type;
 };
 template <typename T1, typename T2, typename T3, typename T4, typename T5>
-struct Types<T1, T2, T3, T4, T5, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType> {
+struct Types<T1, T2, T3, T4, T5, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
   typedef internal::Types5<T1, T2, T3, T4, T5> type;
 };
 template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T6>
-struct Types<T1, T2, T3, T4, T5, T6, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType> {
+struct Types<T1, T2, T3, T4, T5, T6, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
   typedef internal::Types6<T1, T2, T3, T4, T5, T6> type;
 };
 template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T6, typename T7>
-struct Types<T1, T2, T3, T4, T5, T6, T7, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType> {
+struct Types<T1, T2, T3, T4, T5, T6, T7, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
   typedef internal::Types7<T1, T2, T3, T4, T5, T6, T7> type;
 };
 template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T6, typename T7, typename T8>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType> {
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
   typedef internal::Types8<T1, T2, T3, T4, T5, T6, T7, T8> type;
 };
 template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T6, typename T7, typename T8, typename T9>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType> {
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
   typedef internal::Types9<T1, T2, T3, T4, T5, T6, T7, T8, T9> type;
 };
 template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T6, typename T7, typename T8, typename T9, typename T10>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType> {
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
   typedef internal::Types10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> type;
 };
 template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T6, typename T7, typename T8, typename T9, typename T10,
     typename T11>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType> {
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
   typedef internal::Types11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> type;
 };
 template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T6, typename T7, typename T8, typename T9, typename T10,
     typename T11, typename T12>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType> {
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
   typedef internal::Types12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
       T12> type;
 };
@@ -964,16 +964,16 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T6, typename T7, typename T8, typename T9, typename T10,
     typename T11, typename T12, typename T13>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType> {
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
   typedef internal::Types13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13> type;
 };
@@ -981,15 +981,15 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T6, typename T7, typename T8, typename T9, typename T10,
     typename T11, typename T12, typename T13, typename T14>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType> {
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
   typedef internal::Types14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14> type;
 };
@@ -997,15 +997,15 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T6, typename T7, typename T8, typename T9, typename T10,
     typename T11, typename T12, typename T13, typename T14, typename T15>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType> {
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
   typedef internal::Types15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15> type;
 };
@@ -1014,15 +1014,15 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T11, typename T12, typename T13, typename T14, typename T15,
     typename T16>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType> {
+    T16, internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
   typedef internal::Types16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16> type;
 };
@@ -1031,15 +1031,15 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T11, typename T12, typename T13, typename T14, typename T15,
     typename T16, typename T17>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType> {
+    T16, T17, internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
   typedef internal::Types17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17> type;
 };
@@ -1048,15 +1048,15 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T11, typename T12, typename T13, typename T14, typename T15,
     typename T16, typename T17, typename T18>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType> {
+    T16, T17, T18, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
   typedef internal::Types18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18> type;
 };
@@ -1065,14 +1065,14 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T11, typename T12, typename T13, typename T14, typename T15,
     typename T16, typename T17, typename T18, typename T19>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType> {
+    T16, T17, T18, T19, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
   typedef internal::Types19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19> type;
 };
@@ -1081,14 +1081,14 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T11, typename T12, typename T13, typename T14, typename T15,
     typename T16, typename T17, typename T18, typename T19, typename T20>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType> {
+    T16, T17, T18, T19, T20, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
   typedef internal::Types20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20> type;
 };
@@ -1098,14 +1098,14 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T16, typename T17, typename T18, typename T19, typename T20,
     typename T21>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType> {
+    T16, T17, T18, T19, T20, T21, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
   typedef internal::Types21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21> type;
 };
@@ -1115,14 +1115,14 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T16, typename T17, typename T18, typename T19, typename T20,
     typename T21, typename T22>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType> {
+    T16, T17, T18, T19, T20, T21, T22, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
   typedef internal::Types22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> type;
 };
@@ -1132,14 +1132,14 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T16, typename T17, typename T18, typename T19, typename T20,
     typename T21, typename T22, typename T23>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType> {
+    T16, T17, T18, T19, T20, T21, T22, T23, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
   typedef internal::Types23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> type;
 };
@@ -1149,14 +1149,14 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T16, typename T17, typename T18, typename T19, typename T20,
     typename T21, typename T22, typename T23, typename T24>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType> {
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
   typedef internal::Types24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> type;
 };
@@ -1166,13 +1166,13 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T16, typename T17, typename T18, typename T19, typename T20,
     typename T21, typename T22, typename T23, typename T24, typename T25>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType> {
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
   typedef internal::Types25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> type;
 };
@@ -1183,13 +1183,13 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T21, typename T22, typename T23, typename T24, typename T25,
     typename T26>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType> {
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
   typedef internal::Types26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
       T26> type;
@@ -1201,13 +1201,13 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T21, typename T22, typename T23, typename T24, typename T25,
     typename T26, typename T27>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType> {
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
   typedef internal::Types27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27> type;
@@ -1220,12 +1220,12 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T26, typename T27, typename T28>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType> {
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
   typedef internal::Types28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28> type;
@@ -1238,12 +1238,12 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T26, typename T27, typename T28, typename T29>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType> {
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
   typedef internal::Types29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29> type;
@@ -1256,11 +1256,11 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T26, typename T27, typename T28, typename T29, typename T30>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType> {
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
   typedef internal::Types30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30> type;
@@ -1274,11 +1274,11 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T31>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType> {
+    T31, internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
   typedef internal::Types31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31> type;
@@ -1292,11 +1292,11 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T31, typename T32>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType> {
+    T31, T32, internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
   typedef internal::Types32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32> type;
@@ -1310,11 +1310,11 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T31, typename T32, typename T33>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType> {
+    T31, T32, T33, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
   typedef internal::Types33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33> type;
@@ -1328,11 +1328,11 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T31, typename T32, typename T33, typename T34>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType> {
+    T31, T32, T33, T34, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
   typedef internal::Types34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34> type;
@@ -1346,10 +1346,10 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T31, typename T32, typename T33, typename T34, typename T35>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType> {
+    T31, T32, T33, T34, T35, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
   typedef internal::Types35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35> type;
@@ -1364,10 +1364,10 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T36>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType> {
+    T31, T32, T33, T34, T35, T36, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
   typedef internal::Types36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35, T36> type;
@@ -1382,10 +1382,10 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T36, typename T37>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType> {
+    T31, T32, T33, T34, T35, T36, T37, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
   typedef internal::Types37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37> type;
@@ -1400,10 +1400,10 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T36, typename T37, typename T38>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType> {
+    T31, T32, T33, T34, T35, T36, T37, T38, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
   typedef internal::Types38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> type;
@@ -1418,10 +1418,10 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T36, typename T37, typename T38, typename T39>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType> {
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
   typedef internal::Types39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> type;
@@ -1436,10 +1436,10 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T36, typename T37, typename T38, typename T39, typename T40>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType> {
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
   typedef internal::Types40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
@@ -1456,9 +1456,9 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T41>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType> {
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
   typedef internal::Types41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
@@ -1475,9 +1475,9 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
     typename T41, typename T42>
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType> {
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
   typedef internal::Types42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
@@ -1495,8 +1495,8 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
     T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType, internal::NoneType> {
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
   typedef internal::Types43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
@@ -1514,8 +1514,8 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
     T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType, internal::NoneType> {
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
   typedef internal::Types44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
@@ -1533,8 +1533,8 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
     T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType,
-    internal::NoneType> {
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
   typedef internal::Types45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
@@ -1553,7 +1553,7 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
     T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    T46, internal::NoneType, internal::NoneType, internal::NoneType, internal::NoneType> {
+    T46, internal::None, internal::None, internal::None, internal::None> {
   typedef internal::Types46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
@@ -1572,7 +1572,7 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
     T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    T46, T47, internal::NoneType, internal::NoneType, internal::NoneType> {
+    T46, T47, internal::None, internal::None, internal::None> {
   typedef internal::Types47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
@@ -1591,7 +1591,7 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
     T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    T46, T47, T48, internal::NoneType, internal::NoneType> {
+    T46, T47, T48, internal::None, internal::None> {
   typedef internal::Types48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
@@ -1610,7 +1610,7 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
 struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
     T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
     T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    T46, T47, T48, T49, internal::NoneType> {
+    T46, T47, T48, T49, internal::None> {
   typedef internal::Types49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
       T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
       T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
diff --git a/test/gtest-1.8.0/googletest/include/gtest/internal/gtest-type-util.h.pump b/test/gtest-1.8.0/googletest/include/gtest/internal/gtest-type-util.h.pump
index c700d3c..251fdf0 100644
--- a/test/gtest-1.8.0/googletest/include/gtest/internal/gtest-type-util.h.pump
+++ b/test/gtest-1.8.0/googletest/include/gtest/internal/gtest-type-util.h.pump
@@ -103,7 +103,7 @@ struct AssertTypeEq<T, T> {
 // template Types.  This allows us to simulate variadic templates
 // (e.g. Types<int>, Type<int, double>, and etc), which C++ doesn't
 // support directly.
-struct NoneType {};
+struct None {};
 
 // The following family of struct and struct templates are used to
 // represent type lists.  In particular, TypesN<T1, T2, ..., TN>
@@ -144,7 +144,7 @@ struct Types$i {
 // easier to write, but generates horrible messages when there is a
 // compiler error, as gcc insists on printing out each template
 // argument, even if it has the default value (this means Types<int>
-// will appear as Types<int, NoneType, None, ..., NoneType> in the compiler
+// will appear as Types<int, None, None, ..., None> in the compiler
 // errors).
 //
 // Our solution is to combine the best part of the two approaches: a
@@ -154,13 +154,13 @@ struct Types$i {
 // Types template.
 
 $range i 1..n
-template <$for i, [[typename T$i = internal::NoneType]]>
+template <$for i, [[typename T$i = internal::None]]>
 struct Types {
   typedef internal::Types$n<$for i, [[T$i]]> type;
 };
 
 template <>
-struct Types<$for i, [[internal::NoneType]]> {
+struct Types<$for i, [[internal::None]]> {
   typedef internal::Types0 type;
 };
 
@@ -169,7 +169,7 @@ $for i [[
 $range j 1..i
 $range k i+1..n
 template <$for j, [[typename T$j]]>
-struct Types<$for j, [[T$j]]$for k[[, internal::NoneType]]> {
+struct Types<$for j, [[T$j]]$for k[[, internal::None]]> {
   typedef internal::Types$i<$for j, [[T$j]]> type;
 };
 
diff --git a/test/gtest-1.8.0/googletest/src/gtest.cc b/test/gtest-1.8.0/googletest/src/gtest.cc
index 18de59c..d882ab2 100644
--- a/test/gtest-1.8.0/googletest/src/gtest.cc
+++ b/test/gtest-1.8.0/googletest/src/gtest.cc
@@ -4997,7 +4997,7 @@ bool AlwaysTrue() {
 
 // If *pstr starts with the given prefix, modifies *pstr to be right
 // past the prefix and returns true; otherwise leaves *pstr unchanged
-// and returns false.  NoneType of pstr, *pstr, and prefix can be NULL.
+// and returns false.  None of pstr, *pstr, and prefix can be NULL.
 bool SkipPrefix(const char* prefix, const char** pstr) {
   const size_t prefix_len = strlen(prefix);
   if (strncmp(*pstr, prefix, prefix_len) == 0) {
diff --git a/test/gtest-1.8.0/googletest/test/gtest_repeat_test.cc b/test/gtest-1.8.0/googletest/test/gtest_repeat_test.cc
index deede9b..481012a 100644
--- a/test/gtest-1.8.0/googletest/test/gtest_repeat_test.cc
+++ b/test/gtest-1.8.0/googletest/test/gtest_repeat_test.cc
@@ -181,7 +181,7 @@ void TestRepeat(int repeat) {
 // set of tests.
 void TestRepeatWithEmptyFilter(int repeat) {
   GTEST_FLAG(repeat) = repeat;
-  GTEST_FLAG(filter) = "NoneType";
+  GTEST_FLAG(filter) = "None";
 
   ResetCounts();
   GTEST_CHECK_INT_EQ_(0, RUN_ALL_TESTS());