diff mbox series

Bug 26770 - Spurious declaration-only-ness induces spurious type changes

Message ID 87r1pc88u0.fsf@redhat.com
State New
Headers
Series Bug 26770 - Spurious declaration-only-ness induces spurious type changes |

Commit Message

Dodji Seketeli Nov. 2, 2020, 8:24 a.m. UTC 
  Sometimes when amending a C++ class to add new members or properties
to it as directed by the DWARF debug information, we can end-up with
discrepancies related to declaration-only-ness.  That is, an instances
of a given type Foo can be wrongly assigned declaration-only-ness that
should have been only carried by another instance Foo.  Then, later,
comparing two pointers to Foo might wrongly lead to spurious reported
changes due to the spurious differences of declaration-only-ness in
two instances of Foo.

By fixing the setting of the declaration-only-ness, especially when
amending a C++ class this patch fixes that spurious change detected.

	* src/abg-dwarf-reader.cc (add_or_update_class_type): When
	creating a class, set declaration-only-ness unconditionally.  When
	updating the class however, only set the declaration-only-ness
	when the current one is not consistent with the size of the class.
	* tests/data/test-annotate/test14-pr18893.so.abi: Adjust.
	* tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi: Likewise.
	* tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi: Likewise.
	* tests/data/test-read-dwarf/test14-pr18893.so.abi: Likewise.
	* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi: Likewise.
	* tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi: Likewise.
	* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi: Likewise.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 src/abg-dwarf-reader.cc                       |   21 +-
 .../data/test-annotate/test14-pr18893.so.abi  | 4026 +++++------
 ...19-pr19023-libtcmalloc_and_profiler.so.abi | 5016 +++++++-------
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |  616 +-
 .../test-read-dwarf/test14-pr18893.so.abi     | 3958 +++++------
 ...19-pr19023-libtcmalloc_and_profiler.so.abi | 6134 ++++++++---------
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |  558 +-
 .../test22-pr19097-libstdc++.so.6.0.17.so.abi | 4003 ++++++-----
 8 files changed, 11840 insertions(+), 12492 deletions(-)
diff mbox series

Patch

diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index f19c4ae3..475db165 100644
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -13615,8 +13615,7 @@  add_or_update_class_type(read_context&	 ctxt,
 				  decl_base::VISIBILITY_DEFAULT,
 				  is_anonymous));
 
-      if (is_declaration_only)
-	result->set_is_declaration_only(true);
+      result->set_is_declaration_only(is_declaration_only);
 
       res = add_decl_to_scope(result, scope);
       result = dynamic_pointer_cast<class_decl>(res);
@@ -13626,6 +13625,24 @@  add_or_update_class_type(read_context&	 ctxt,
   if (size)
     result->set_size_in_bits(size);
 
+  if (klass)
+    // We are amending a class that was built before.  So let's check
+    // if we need to amend its "declaration-only-ness" status.
+    if (!!result->get_size_in_bits() == result->get_is_declaration_only())
+      // The size of the class doesn't match its
+      // 'declaration-only-ness".  We might have a non-zero sized
+      // class which is declaration-only, or a zero sized class that
+      // is not declaration-only.  Let's set the declaration-only-ness
+      // according to what we are instructed to.
+      //
+      // Note however that there are binaries out there emitted by
+      // compilers (Clang, in C++) emit declarations-only classes that
+      // have non-zero size.  So we must honor these too. That is why
+      // we are not forcing the declaration-only-ness to false when a
+      // class has non-zero size.  An example of such binary is
+      // tests/data/test-diff-filter/test41-PR21486-abg-writer.llvm.o.
+      result->set_is_declaration_only(is_declaration_only);
+
   result->set_is_artificial(is_artificial);
 
   ctxt.associate_die_to_type(die, result, where_offset);
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index c3a4a673..6df9b65e 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -137,209 +137,305 @@ 
       <!-- <anonymous range>[40] -->
       <subrange length='40' type-id='type-id-3' id='type-id-6'/>
     </array-type-def>
+    <!-- class CachingEvaluator -->
+    <class-decl name='CachingEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' id='type-id-7'>
+      <member-type access='private'>
+        <!-- enum CachingEvaluator::ServiceMode -->
+        <enum-decl name='ServiceMode' filepath='libnurbs/internals/cachingeval.h' line='42' column='1' id='type-id-8'>
+          <underlying-type type-id='type-id-9'/>
+          <enumerator name='play' value='0'/>
+          <enumerator name='record' value='1'/>
+          <enumerator name='playAndRecord' value='2'/>
+        </enum-decl>
+      </member-type>
+      <member-function access='private' destructor='yes' vtable-offset='-1'>
+        <!-- CachingEvaluator::~CachingEvaluator(int) -->
+        <function-decl name='~CachingEvaluator' filepath='libnurbs/internals/cachingeval.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='2'>
+        <!-- int CachingEvaluator::canRecord() -->
+        <function-decl name='canRecord' mangled-name='_ZN16CachingEvaluator9canRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- int -->
+          <return type-id='type-id-11'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='3'>
+        <!-- int CachingEvaluator::canPlayAndRecord() -->
+        <function-decl name='canPlayAndRecord' mangled-name='_ZN16CachingEvaluator16canPlayAndRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- int -->
+          <return type-id='type-id-11'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='4'>
+        <!-- int CachingEvaluator::createHandle(int) -->
+        <function-decl name='createHandle' mangled-name='_ZN16CachingEvaluator12createHandleEi' filepath='libnurbs/internals/cachingeval.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- parameter of type 'int' -->
+          <parameter type-id='type-id-11'/>
+          <!-- int -->
+          <return type-id='type-id-11'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='5'>
+        <!-- void CachingEvaluator::beginOutput(CachingEvaluator::ServiceMode, int) -->
+        <function-decl name='beginOutput' mangled-name='_ZN16CachingEvaluator11beginOutputENS_11ServiceModeEi' filepath='libnurbs/internals/cachingeval.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- parameter of type 'enum CachingEvaluator::ServiceMode' -->
+          <parameter type-id='type-id-8'/>
+          <!-- parameter of type 'int' -->
+          <parameter type-id='type-id-11'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='6'>
+        <!-- void CachingEvaluator::endOutput() -->
+        <function-decl name='endOutput' mangled-name='_ZN16CachingEvaluator9endOutputEv' filepath='libnurbs/internals/cachingeval.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='7'>
+        <!-- void CachingEvaluator::discardRecording(int) -->
+        <function-decl name='discardRecording' mangled-name='_ZN16CachingEvaluator16discardRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='8'>
+        <!-- void CachingEvaluator::playRecording(int) -->
+        <function-decl name='playRecording' mangled-name='_ZN16CachingEvaluator13playRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
     <!-- struct BasicCurveEvaluator -->
-    <class-decl name='BasicCurveEvaluator' size-in-bits='64' is-struct='yes' visibility='default' filepath='libnurbs/internals/basiccrveval.h' line='43' column='1' id='type-id-7'>
+    <class-decl name='BasicCurveEvaluator' size-in-bits='64' is-struct='yes' visibility='default' filepath='libnurbs/internals/basiccrveval.h' line='43' column='1' id='type-id-13'>
       <!-- class CachingEvaluator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-8'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-7'/>
       <member-function access='public' destructor='yes' vtable-offset='-1'>
         <!-- BasicCurveEvaluator::~BasicCurveEvaluator(int) -->
         <function-decl name='~BasicCurveEvaluator' filepath='libnurbs/internals/basiccrveval.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='9'>
         <!-- void BasicCurveEvaluator::domain1f(REAL, REAL) -->
         <function-decl name='domain1f' mangled-name='_ZN19BasicCurveEvaluator8domain1fEff' filepath='libnurbs/internals/basiccrveval.cc' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='10'>
         <!-- void BasicCurveEvaluator::range1f(long int, REAL*, REAL*) -->
         <function-decl name='range1f' mangled-name='_ZN19BasicCurveEvaluator7range1fElPfS0_' filepath='libnurbs/internals/basiccrveval.cc' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='11'>
         <!-- void BasicCurveEvaluator::enable(long int) -->
         <function-decl name='enable' mangled-name='_ZN19BasicCurveEvaluator6enableEl' filepath='libnurbs/internals/basiccrveval.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='12'>
         <!-- void BasicCurveEvaluator::disable(long int) -->
         <function-decl name='disable' mangled-name='_ZN19BasicCurveEvaluator7disableEl' filepath='libnurbs/internals/basiccrveval.cc' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='13'>
         <!-- void BasicCurveEvaluator::bgnmap1f(long int) -->
         <function-decl name='bgnmap1f' mangled-name='_ZN19BasicCurveEvaluator8bgnmap1fEl' filepath='libnurbs/internals/basiccrveval.cc' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='14'>
         <!-- void BasicCurveEvaluator::map1f(long int, REAL, REAL, long int, long int, REAL*) -->
         <function-decl name='map1f' mangled-name='_ZN19BasicCurveEvaluator5map1fElffllPf' filepath='libnurbs/internals/basiccrveval.cc' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='15'>
         <!-- void BasicCurveEvaluator::mapgrid1f(long int, REAL, REAL) -->
         <function-decl name='mapgrid1f' mangled-name='_ZN19BasicCurveEvaluator9mapgrid1fElff' filepath='libnurbs/internals/basiccrveval.cc' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='16'>
         <!-- void BasicCurveEvaluator::mapmesh1f(long int, long int, long int) -->
         <function-decl name='mapmesh1f' mangled-name='_ZN19BasicCurveEvaluator9mapmesh1fElll' filepath='libnurbs/internals/basiccrveval.cc' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='17'>
         <!-- void BasicCurveEvaluator::evalcoord1f(long int, REAL) -->
         <function-decl name='evalcoord1f' mangled-name='_ZN19BasicCurveEvaluator11evalcoord1fElf' filepath='libnurbs/internals/basiccrveval.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='18'>
         <!-- void BasicCurveEvaluator::endmap1f() -->
         <function-decl name='endmap1f' mangled-name='_ZN19BasicCurveEvaluator8endmap1fEv' filepath='libnurbs/internals/basiccrveval.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='19'>
         <!-- void BasicCurveEvaluator::bgnline() -->
         <function-decl name='bgnline' mangled-name='_ZN19BasicCurveEvaluator7bgnlineEv' filepath='libnurbs/internals/basiccrveval.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='20'>
         <!-- void BasicCurveEvaluator::endline() -->
         <function-decl name='endline' mangled-name='_ZN19BasicCurveEvaluator7endlineEv' filepath='libnurbs/internals/basiccrveval.cc' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- class OpenGLCurveEvaluator -->
-    <class-decl name='OpenGLCurveEvaluator' size-in-bits='27584' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='66' column='1' id='type-id-14'>
+    <class-decl name='OpenGLCurveEvaluator' size-in-bits='27584' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='66' column='1' id='type-id-17'>
       <!-- struct BasicCurveEvaluator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-7'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-13'/>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- curveEvalMachine OpenGLCurveEvaluator::em_vertex -->
-        <var-decl name='em_vertex' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='102' column='1'/>
+        <var-decl name='em_vertex' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='102' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='6656'>
         <!-- curveEvalMachine OpenGLCurveEvaluator::em_normal -->
-        <var-decl name='em_normal' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='103' column='1'/>
+        <var-decl name='em_normal' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='103' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='13248'>
         <!-- curveEvalMachine OpenGLCurveEvaluator::em_color -->
-        <var-decl name='em_color' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='104' column='1'/>
+        <var-decl name='em_color' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='104' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='19840'>
         <!-- curveEvalMachine OpenGLCurveEvaluator::em_texcoord -->
-        <var-decl name='em_texcoord' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='105' column='1'/>
+        <var-decl name='em_texcoord' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='105' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26432'>
         <!-- int OpenGLCurveEvaluator::vertex_flag -->
-        <var-decl name='vertex_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='106' column='1'/>
+        <var-decl name='vertex_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='106' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26464'>
         <!-- int OpenGLCurveEvaluator::normal_flag -->
-        <var-decl name='normal_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='107' column='1'/>
+        <var-decl name='normal_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='107' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26496'>
         <!-- int OpenGLCurveEvaluator::color_flag -->
-        <var-decl name='color_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='108' column='1'/>
+        <var-decl name='color_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='108' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26528'>
         <!-- int OpenGLCurveEvaluator::texcoord_flag -->
-        <var-decl name='texcoord_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='109' column='1'/>
+        <var-decl name='texcoord_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='109' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26560'>
         <!-- REAL OpenGLCurveEvaluator::global_grid_u0 -->
@@ -351,458 +447,458 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='26624'>
         <!-- int OpenGLCurveEvaluator::global_grid_nu -->
-        <var-decl name='global_grid_nu' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='113' column='1'/>
+        <var-decl name='global_grid_nu' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='113' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26688'>
         <!-- void (typedef GLenum)* OpenGLCurveEvaluator::beginCallBackN -->
-        <var-decl name='beginCallBackN' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='128' column='1'/>
+        <var-decl name='beginCallBackN' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26752'>
         <!-- void ()* OpenGLCurveEvaluator::endCallBackN -->
-        <var-decl name='endCallBackN' type-id='type-id-17' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='129' column='1'/>
+        <var-decl name='endCallBackN' type-id='type-id-20' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='129' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26816'>
         <!-- void (const GLfloat*)* OpenGLCurveEvaluator::vertexCallBackN -->
-        <var-decl name='vertexCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='130' column='1'/>
+        <var-decl name='vertexCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='130' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26880'>
         <!-- void (const GLfloat*)* OpenGLCurveEvaluator::normalCallBackN -->
-        <var-decl name='normalCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='131' column='1'/>
+        <var-decl name='normalCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='131' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26944'>
         <!-- void (const GLfloat*)* OpenGLCurveEvaluator::colorCallBackN -->
-        <var-decl name='colorCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='132' column='1'/>
+        <var-decl name='colorCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27008'>
         <!-- void (const GLfloat*)* OpenGLCurveEvaluator::texcoordCallBackN -->
-        <var-decl name='texcoordCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='133' column='1'/>
+        <var-decl name='texcoordCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='133' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27072'>
         <!-- void (typedef GLenum, void*)* OpenGLCurveEvaluator::beginCallBackData -->
-        <var-decl name='beginCallBackData' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='135' column='1'/>
+        <var-decl name='beginCallBackData' type-id='type-id-22' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='135' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27136'>
         <!-- void (void*)* OpenGLCurveEvaluator::endCallBackData -->
-        <var-decl name='endCallBackData' type-id='type-id-20' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='136' column='1'/>
+        <var-decl name='endCallBackData' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='136' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27200'>
         <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::vertexCallBackData -->
-        <var-decl name='vertexCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='137' column='1'/>
+        <var-decl name='vertexCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='137' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27264'>
         <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::normalCallBackData -->
-        <var-decl name='normalCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='138' column='1'/>
+        <var-decl name='normalCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='138' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27328'>
         <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::colorCallBackData -->
-        <var-decl name='colorCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='139' column='1'/>
+        <var-decl name='colorCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='139' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27392'>
         <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::texcoordCallBackData -->
-        <var-decl name='texcoordCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='140' column='1'/>
+        <var-decl name='texcoordCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='140' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27456'>
         <!-- void* OpenGLCurveEvaluator::userData -->
-        <var-decl name='userData' type-id='type-id-22' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='142' column='1'/>
+        <var-decl name='userData' type-id='type-id-25' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='142' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27520'>
         <!-- int OpenGLCurveEvaluator::output_triangles -->
-        <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='154' column='1'/>
+        <var-decl name='output_triangles' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='154' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- OpenGLCurveEvaluator::OpenGLCurveEvaluator() -->
         <function-decl name='OpenGLCurveEvaluator' filepath='libnurbs/interface/glcurveval.cc' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::addMap(CurveMap*) -->
         <function-decl name='addMap' mangled-name='_ZN20OpenGLCurveEvaluator6addMapEP8CurveMap' filepath='libnurbs/interface/glcurveval.cc' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'CurveMap*' -->
-          <parameter type-id='type-id-24'/>
+          <parameter type-id='type-id-27'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::evalpoint1i(long int) -->
         <function-decl name='evalpoint1i' mangled-name='_ZN20OpenGLCurveEvaluator11evalpoint1iEl' filepath='libnurbs/interface/glcurveval.cc' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::put_vertices_call_back(int) -->
         <function-decl name='put_vertices_call_back' mangled-name='_ZN20OpenGLCurveEvaluator22put_vertices_call_backEi' filepath='libnurbs/interface/glcurveval.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::putCallBack(GLenum, _GLUfuncptr) -->
         <function-decl name='putCallBack' mangled-name='_ZN20OpenGLCurveEvaluator11putCallBackEjPFvvE' filepath='libnurbs/interface/glcurveval.cc' line='305' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'typedef GLenum' -->
-          <parameter type-id='type-id-25'/>
+          <parameter type-id='type-id-28'/>
           <!-- parameter of type 'typedef _GLUfuncptr' -->
-          <parameter type-id='type-id-26'/>
+          <parameter type-id='type-id-29'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::set_callback_userData(void*) -->
         <function-decl name='set_callback_userData' mangled-name='_ZN20OpenGLCurveEvaluator21set_callback_userDataEPv' filepath='libnurbs/interface/glcurveval.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::inMap1f(int, int, REAL, REAL, int, int, REAL*) -->
         <function-decl name='inMap1f' mangled-name='_ZN20OpenGLCurveEvaluator7inMap1fEiiffiiPf' filepath='libnurbs/interface/glcurveval.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::inPreEvaluate(int, REAL, REAL*) -->
         <function-decl name='inPreEvaluate' mangled-name='_ZN20OpenGLCurveEvaluator13inPreEvaluateEifPf' filepath='libnurbs/interface/glcurveval.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::inDoDomain1(curveEvalMachine*, REAL, REAL*) -->
         <function-decl name='inDoDomain1' mangled-name='_ZN20OpenGLCurveEvaluator11inDoDomain1EP16curveEvalMachinefPf' filepath='libnurbs/interface/glcurveval.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'curveEvalMachine*' -->
-          <parameter type-id='type-id-27'/>
+          <parameter type-id='type-id-30'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::inDoEvalCoord1(REAL) -->
         <function-decl name='inDoEvalCoord1' mangled-name='_ZN20OpenGLCurveEvaluator14inDoEvalCoord1Ef' filepath='libnurbs/interface/glcurveval.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::inMapMesh1f(int, int) -->
         <function-decl name='inMapMesh1f' mangled-name='_ZN20OpenGLCurveEvaluator11inMapMesh1fEii' filepath='libnurbs/interface/glcurveval.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::beginCallBack(GLenum, void*) -->
         <function-decl name='beginCallBack' mangled-name='_ZN20OpenGLCurveEvaluator13beginCallBackEjPv' filepath='libnurbs/interface/glcurveval.cc' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'typedef GLenum' -->
-          <parameter type-id='type-id-25'/>
+          <parameter type-id='type-id-28'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::endCallBack(void*) -->
         <function-decl name='endCallBack' mangled-name='_ZN20OpenGLCurveEvaluator11endCallBackEPv' filepath='libnurbs/interface/glcurveval.cc' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::vertexCallBack(const GLfloat*, void*) -->
         <function-decl name='vertexCallBack' mangled-name='_ZN20OpenGLCurveEvaluator14vertexCallBackEPKfPv' filepath='libnurbs/interface/glcurveval.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::normalCallBack(const GLfloat*, void*) -->
         <function-decl name='normalCallBack' mangled-name='_ZN20OpenGLCurveEvaluator14normalCallBackEPKfPv' filepath='libnurbs/interface/glcurveval.cc' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::colorCallBack(const GLfloat*, void*) -->
         <function-decl name='colorCallBack' mangled-name='_ZN20OpenGLCurveEvaluator13colorCallBackEPKfPv' filepath='libnurbs/interface/glcurveval.cc' line='387' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::texcoordCallBack(const GLfloat*, void*) -->
         <function-decl name='texcoordCallBack' mangled-name='_ZN20OpenGLCurveEvaluator16texcoordCallBackEPKfPv' filepath='libnurbs/interface/glcurveval.cc' line='396' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <!-- OpenGLCurveEvaluator::~OpenGLCurveEvaluator(int) -->
         <function-decl name='~OpenGLCurveEvaluator' filepath='libnurbs/interface/glcurveval.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='9'>
         <!-- void OpenGLCurveEvaluator::domain1f(REAL, REAL) -->
         <function-decl name='domain1f' mangled-name='_ZN20OpenGLCurveEvaluator8domain1fEff' filepath='libnurbs/interface/glcurveval.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='10'>
         <!-- void OpenGLCurveEvaluator::range1f(long int, REAL*, REAL*) -->
         <function-decl name='range1f' mangled-name='_ZN20OpenGLCurveEvaluator7range1fElPfS0_' filepath='libnurbs/interface/glcurveval.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='11'>
         <!-- void OpenGLCurveEvaluator::enable(long int) -->
         <function-decl name='enable' mangled-name='_ZN20OpenGLCurveEvaluator6enableEl' filepath='libnurbs/interface/glcurveval.cc' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='12'>
         <!-- void OpenGLCurveEvaluator::disable(long int) -->
         <function-decl name='disable' mangled-name='_ZN20OpenGLCurveEvaluator7disableEl' filepath='libnurbs/interface/glcurveval.cc' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='13'>
         <!-- void OpenGLCurveEvaluator::bgnmap1f(long int) -->
         <function-decl name='bgnmap1f' mangled-name='_ZN20OpenGLCurveEvaluator8bgnmap1fEl' filepath='libnurbs/interface/glcurveval.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='14'>
         <!-- void OpenGLCurveEvaluator::map1f(long int, REAL, REAL, long int, long int, REAL*) -->
         <function-decl name='map1f' mangled-name='_ZN20OpenGLCurveEvaluator5map1fElffllPf' filepath='libnurbs/interface/glcurveval.cc' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='15'>
         <!-- void OpenGLCurveEvaluator::mapgrid1f(long int, REAL, REAL) -->
         <function-decl name='mapgrid1f' mangled-name='_ZN20OpenGLCurveEvaluator9mapgrid1fElff' filepath='libnurbs/interface/glcurveval.cc' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='16'>
         <!-- void OpenGLCurveEvaluator::mapmesh1f(long int, long int, long int) -->
         <function-decl name='mapmesh1f' mangled-name='_ZN20OpenGLCurveEvaluator9mapmesh1fElll' filepath='libnurbs/interface/glcurveval.cc' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='17'>
         <!-- void OpenGLCurveEvaluator::evalcoord1f(long int, REAL) -->
         <function-decl name='evalcoord1f' mangled-name='_ZN20OpenGLCurveEvaluator11evalcoord1fElf' filepath='libnurbs/interface/glcurveval.cc' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='18'>
         <!-- void OpenGLCurveEvaluator::endmap1f() -->
         <function-decl name='endmap1f' mangled-name='_ZN20OpenGLCurveEvaluator8endmap1fEv' filepath='libnurbs/interface/glcurveval.cc' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='19'>
         <!-- void OpenGLCurveEvaluator::bgnline() -->
         <function-decl name='bgnline' mangled-name='_ZN20OpenGLCurveEvaluator7bgnlineEv' filepath='libnurbs/interface/glcurveval.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='20'>
         <!-- void OpenGLCurveEvaluator::endline() -->
         <function-decl name='endline' mangled-name='_ZN20OpenGLCurveEvaluator7endlineEv' filepath='libnurbs/interface/glcurveval.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- typedef curveEvalMachine curveEvalMachine -->
-    <typedef-decl name='curveEvalMachine' type-id='type-id-29' filepath='libnurbs/interface/glcurveval.h' line='64' column='1' id='type-id-15'/>
+    <typedef-decl name='curveEvalMachine' type-id='type-id-32' filepath='libnurbs/interface/glcurveval.h' line='64' column='1' id='type-id-18'/>
     <!-- struct curveEvalMachine -->
-    <class-decl name='curveEvalMachine' size-in-bits='6592' is-struct='yes' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='55' column='1' id='type-id-29'>
+    <class-decl name='curveEvalMachine' size-in-bits='6592' is-struct='yes' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='55' column='1' id='type-id-32'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL curveEvalMachine::uprime -->
         <var-decl name='uprime' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- int curveEvalMachine::k -->
-        <var-decl name='k' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='57' column='1'/>
+        <var-decl name='k' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- REAL curveEvalMachine::u1 -->
@@ -814,11 +910,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int curveEvalMachine::ustride -->
-        <var-decl name='ustride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='60' column='1'/>
+        <var-decl name='ustride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int curveEvalMachine::uorder -->
-        <var-decl name='uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='61' column='1'/>
+        <var-decl name='uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- REAL curveEvalMachine::ctlpoints[160] -->
@@ -830,141 +926,45 @@ 
       </data-member>
     </class-decl>
     <!-- typedef float REAL -->
-    <typedef-decl name='REAL' type-id='type-id-30' filepath='libnurbs/internals/types.h' line='41' column='1' id='type-id-1'/>
+    <typedef-decl name='REAL' type-id='type-id-33' filepath='libnurbs/internals/types.h' line='41' column='1' id='type-id-1'/>
     <!-- BasicCurveEvaluator* -->
-    <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-9'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-14'/>
     <!-- CachingEvaluator* -->
-    <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-31'/>
+    <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-10'/>
     <!-- CurveMap* -->
-    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-24'/>
+    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-27'/>
     <!-- OpenGLCurveEvaluator* -->
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-23'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-26'/>
     <!-- REAL* -->
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-13'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-16'/>
     <!-- const GLfloat -->
-    <qualified-type-def type-id='type-id-33' const='yes' id='type-id-34'/>
+    <qualified-type-def type-id='type-id-35' const='yes' id='type-id-36'/>
     <!-- const GLfloat* -->
-    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-28'/>
+    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-31'/>
     <!-- curveEvalMachine* -->
-    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-27'/>
+    <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-30'/>
     <!-- void (const GLfloat*)* -->
-    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-18'/>
+    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-21'/>
     <!-- void (const GLfloat*, void*)* -->
-    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-21'/>
-    <!-- class CachingEvaluator -->
-    <class-decl name='CachingEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' is-declaration-only='yes' id='type-id-8'>
-      <member-type access='private'>
-        <!-- enum CachingEvaluator::ServiceMode -->
-        <enum-decl name='ServiceMode' filepath='libnurbs/internals/cachingeval.h' line='42' column='1' id='type-id-37'>
-          <underlying-type type-id='type-id-38'/>
-          <enumerator name='play' value='0'/>
-          <enumerator name='record' value='1'/>
-          <enumerator name='playAndRecord' value='2'/>
-        </enum-decl>
-      </member-type>
-      <member-function access='private' destructor='yes' vtable-offset='-1'>
-        <!-- CachingEvaluator::~CachingEvaluator(int) -->
-        <function-decl name='~CachingEvaluator' filepath='libnurbs/internals/cachingeval.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='2'>
-        <!-- int CachingEvaluator::canRecord() -->
-        <function-decl name='canRecord' mangled-name='_ZN16CachingEvaluator9canRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- int -->
-          <return type-id='type-id-10'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='3'>
-        <!-- int CachingEvaluator::canPlayAndRecord() -->
-        <function-decl name='canPlayAndRecord' mangled-name='_ZN16CachingEvaluator16canPlayAndRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- int -->
-          <return type-id='type-id-10'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='4'>
-        <!-- int CachingEvaluator::createHandle(int) -->
-        <function-decl name='createHandle' mangled-name='_ZN16CachingEvaluator12createHandleEi' filepath='libnurbs/internals/cachingeval.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
-          <!-- int -->
-          <return type-id='type-id-10'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='5'>
-        <!-- void CachingEvaluator::beginOutput(CachingEvaluator::ServiceMode, int) -->
-        <function-decl name='beginOutput' mangled-name='_ZN16CachingEvaluator11beginOutputENS_11ServiceModeEi' filepath='libnurbs/internals/cachingeval.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- parameter of type 'enum CachingEvaluator::ServiceMode' -->
-          <parameter type-id='type-id-37'/>
-          <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
-          <!-- void -->
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='6'>
-        <!-- void CachingEvaluator::endOutput() -->
-        <function-decl name='endOutput' mangled-name='_ZN16CachingEvaluator9endOutputEv' filepath='libnurbs/internals/cachingeval.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='7'>
-        <!-- void CachingEvaluator::discardRecording(int) -->
-        <function-decl name='discardRecording' mangled-name='_ZN16CachingEvaluator16discardRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='8'>
-        <!-- void CachingEvaluator::playRecording(int) -->
-        <function-decl name='playRecording' mangled-name='_ZN16CachingEvaluator13playRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
+    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-24'/>
     <!-- void (const GLfloat*) -->
-    <function-type size-in-bits='64' id='type-id-35'>
+    <function-type size-in-bits='64' id='type-id-37'>
       <!-- parameter of type 'const GLfloat*' -->
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-31'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (const GLfloat*, void*) -->
-    <function-type size-in-bits='64' id='type-id-36'>
+    <function-type size-in-bits='64' id='type-id-38'>
       <!-- parameter of type 'const GLfloat*' -->
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-31'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- struct CurveMap -->
-    <class-decl name='CurveMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-32'/>
+    <class-decl name='CurveMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-34'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glinterface.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- struct GLUnurbs -->
@@ -985,11 +985,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='1121792'>
         <!-- OpenGLCurveEvaluator GLUnurbs::curveEvaluator -->
-        <var-decl name='curveEvaluator' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='132' column='1'/>
+        <var-decl name='curveEvaluator' type-id='type-id-17' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1149376'>
         <!-- int GLUnurbs::callbackFlag -->
-        <var-decl name='callbackFlag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='143' column='1'/>
+        <var-decl name='callbackFlag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='143' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- void GLUnurbs::setNurbsCallbackData(void*) -->
@@ -997,9 +997,9 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1008,11 +1008,11 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'typedef GLenum' -->
-          <parameter type-id='type-id-25'/>
+          <parameter type-id='type-id-28'/>
           <!-- parameter of type 'typedef _GLUfuncptr' -->
-          <parameter type-id='type-id-26'/>
+          <parameter type-id='type-id-29'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1021,9 +1021,9 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1041,7 +1041,7 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1050,9 +1050,9 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'float' -->
-          <parameter type-id='type-id-30'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1061,9 +1061,9 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1072,9 +1072,9 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -1083,7 +1083,7 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1092,7 +1092,7 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1101,13 +1101,13 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'const GLint*' -->
           <parameter type-id='type-id-45'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1116,7 +1116,7 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1125,7 +1125,7 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1134,9 +1134,9 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1145,7 +1145,7 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1154,9 +1154,9 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1169,7 +1169,7 @@ 
           <!-- parameter of type 'const GLint*' -->
           <parameter type-id='type-id-45'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1180,7 +1180,7 @@ 
           <!-- parameter of type 'GLfloat[4]*' -->
           <parameter type-id='type-id-46'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -1189,7 +1189,7 @@ 
           <!-- parameter of type 'GLfloat[4]*' -->
           <parameter type-id='type-id-46'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -1202,7 +1202,7 @@ 
           <!-- parameter of type 'GLfloat[4]*' -->
           <parameter type-id='type-id-46'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -1215,7 +1215,7 @@ 
           <!-- parameter of type 'GLfloat[4]*' -->
           <parameter type-id='type-id-46'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='2'>
@@ -1224,7 +1224,7 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='3'>
@@ -1233,7 +1233,7 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='6'>
@@ -1242,9 +1242,9 @@ 
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -1258,15 +1258,15 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- int OpenGLSurfaceEvaluator::tmeshing -->
-        <var-decl name='tmeshing' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='181' column='1'/>
+        <var-decl name='tmeshing' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='181' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='288'>
         <!-- int OpenGLSurfaceEvaluator::which -->
-        <var-decl name='which' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='182' column='1'/>
+        <var-decl name='which' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='182' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
         <!-- int OpenGLSurfaceEvaluator::vcount -->
-        <var-decl name='vcount' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='183' column='1'/>
+        <var-decl name='vcount' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='183' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='352'>
         <!-- GLint OpenGLSurfaceEvaluator::gl_polygon_mode[2] -->
@@ -1278,71 +1278,71 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
         <!-- int OpenGLSurfaceEvaluator::output_triangles -->
-        <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
+        <var-decl name='output_triangles' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
         <!-- void (typedef GLenum)* OpenGLSurfaceEvaluator::beginCallBackN -->
-        <var-decl name='beginCallBackN' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
+        <var-decl name='beginCallBackN' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
         <!-- void ()* OpenGLSurfaceEvaluator::endCallBackN -->
-        <var-decl name='endCallBackN' type-id='type-id-17' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
+        <var-decl name='endCallBackN' type-id='type-id-20' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='704'>
         <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::vertexCallBackN -->
-        <var-decl name='vertexCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
+        <var-decl name='vertexCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='768'>
         <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::normalCallBackN -->
-        <var-decl name='normalCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
+        <var-decl name='normalCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
         <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::colorCallBackN -->
-        <var-decl name='colorCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
+        <var-decl name='colorCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='896'>
         <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::texcoordCallBackN -->
-        <var-decl name='texcoordCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
+        <var-decl name='texcoordCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='960'>
         <!-- void (typedef GLenum, void*)* OpenGLSurfaceEvaluator::beginCallBackData -->
-        <var-decl name='beginCallBackData' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
+        <var-decl name='beginCallBackData' type-id='type-id-22' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1024'>
         <!-- void (void*)* OpenGLSurfaceEvaluator::endCallBackData -->
-        <var-decl name='endCallBackData' type-id='type-id-20' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
+        <var-decl name='endCallBackData' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1088'>
         <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::vertexCallBackData -->
-        <var-decl name='vertexCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
+        <var-decl name='vertexCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1152'>
         <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::normalCallBackData -->
-        <var-decl name='normalCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
+        <var-decl name='normalCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1216'>
         <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::colorCallBackData -->
-        <var-decl name='colorCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
+        <var-decl name='colorCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1280'>
         <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::texcoordCallBackData -->
-        <var-decl name='texcoordCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
+        <var-decl name='texcoordCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1344'>
         <!-- void* OpenGLSurfaceEvaluator::userData -->
-        <var-decl name='userData' type-id='type-id-22' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='215' column='1'/>
+        <var-decl name='userData' type-id='type-id-25' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='215' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1408'>
         <!-- int OpenGLSurfaceEvaluator::LOD_eval_level -->
-        <var-decl name='LOD_eval_level' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='222' column='1'/>
+        <var-decl name='LOD_eval_level' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='222' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1440'>
         <!-- int OpenGLSurfaceEvaluator::global_uorder -->
-        <var-decl name='global_uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='231' column='1'/>
+        <var-decl name='global_uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='231' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1472'>
         <!-- int OpenGLSurfaceEvaluator::global_vorder -->
-        <var-decl name='global_vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='232' column='1'/>
+        <var-decl name='global_vorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='232' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1504'>
         <!-- REAL OpenGLSurfaceEvaluator::global_uprime -->
@@ -1362,19 +1362,19 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='1632'>
         <!-- int OpenGLSurfaceEvaluator::global_uorder_BV -->
-        <var-decl name='global_uorder_BV' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='237' column='1'/>
+        <var-decl name='global_uorder_BV' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='237' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1664'>
         <!-- int OpenGLSurfaceEvaluator::global_vorder_BV -->
-        <var-decl name='global_vorder_BV' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='238' column='1'/>
+        <var-decl name='global_vorder_BV' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='238' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1696'>
         <!-- int OpenGLSurfaceEvaluator::global_uorder_BU -->
-        <var-decl name='global_uorder_BU' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='239' column='1'/>
+        <var-decl name='global_uorder_BU' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='239' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1728'>
         <!-- int OpenGLSurfaceEvaluator::global_vorder_BU -->
-        <var-decl name='global_vorder_BU' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='240' column='1'/>
+        <var-decl name='global_vorder_BU' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='240' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1760'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ucoeff[40] -->
@@ -1410,11 +1410,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='27392'>
         <!-- REAL* OpenGLSurfaceEvaluator::global_baseData -->
-        <var-decl name='global_baseData' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='251' column='1'/>
+        <var-decl name='global_baseData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='251' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27456'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_k -->
-        <var-decl name='global_ev_k' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='253' column='1'/>
+        <var-decl name='global_ev_k' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='253' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27488'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ev_u1 -->
@@ -1426,11 +1426,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='27552'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_ustride -->
-        <var-decl name='global_ev_ustride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='256' column='1'/>
+        <var-decl name='global_ev_ustride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='256' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27584'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_uorder -->
-        <var-decl name='global_ev_uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='257' column='1'/>
+        <var-decl name='global_ev_uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='257' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27616'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ev_v1 -->
@@ -1442,11 +1442,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='27680'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_vstride -->
-        <var-decl name='global_ev_vstride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='260' column='1'/>
+        <var-decl name='global_ev_vstride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='260' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27712'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_vorder -->
-        <var-decl name='global_ev_vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='261' column='1'/>
+        <var-decl name='global_ev_vorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='261' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27744'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ev_ctlPoints[6400] -->
@@ -1462,7 +1462,7 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='232608'>
         <!-- int OpenGLSurfaceEvaluator::global_grid_nu -->
-        <var-decl name='global_grid_nu' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='266' column='1'/>
+        <var-decl name='global_grid_nu' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='266' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232640'>
         <!-- REAL OpenGLSurfaceEvaluator::global_grid_v0 -->
@@ -1474,7 +1474,7 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='232704'>
         <!-- int OpenGLSurfaceEvaluator::global_grid_nv -->
-        <var-decl name='global_grid_nv' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='269' column='1'/>
+        <var-decl name='global_grid_nv' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='269' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232736'>
         <!-- surfEvalMachine OpenGLSurfaceEvaluator::em_vertex -->
@@ -1494,27 +1494,27 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073824'>
         <!-- int OpenGLSurfaceEvaluator::auto_normal_flag -->
-        <var-decl name='auto_normal_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='354' column='1'/>
+        <var-decl name='auto_normal_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='354' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073856'>
         <!-- int OpenGLSurfaceEvaluator::callback_auto_normal -->
-        <var-decl name='callback_auto_normal' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='356' column='1'/>
+        <var-decl name='callback_auto_normal' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='356' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073888'>
         <!-- int OpenGLSurfaceEvaluator::vertex_flag -->
-        <var-decl name='vertex_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='357' column='1'/>
+        <var-decl name='vertex_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='357' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073920'>
         <!-- int OpenGLSurfaceEvaluator::normal_flag -->
-        <var-decl name='normal_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='358' column='1'/>
+        <var-decl name='normal_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='358' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073952'>
         <!-- int OpenGLSurfaceEvaluator::color_flag -->
-        <var-decl name='color_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='359' column='1'/>
+        <var-decl name='color_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='359' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073984'>
         <!-- int OpenGLSurfaceEvaluator::texcoord_flag -->
-        <var-decl name='texcoord_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='360' column='1'/>
+        <var-decl name='texcoord_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='360' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- void OpenGLSurfaceEvaluator::set_callback_userData(void*) -->
@@ -1522,9 +1522,9 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1533,9 +1533,9 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -1544,7 +1544,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1555,7 +1555,7 @@ 
           <!-- parameter of type 'SurfaceMap*' -->
           <parameter type-id='type-id-56'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1568,7 +1568,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1577,11 +1577,11 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1594,7 +1594,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1603,11 +1603,11 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1616,11 +1616,11 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'typedef GLenum' -->
-          <parameter type-id='type-id-25'/>
+          <parameter type-id='type-id-28'/>
           <!-- parameter of type 'typedef _GLUfuncptr' -->
-          <parameter type-id='type-id-26'/>
+          <parameter type-id='type-id-29'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1629,7 +1629,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1638,9 +1638,9 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1649,7 +1649,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1658,9 +1658,9 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1669,11 +1669,11 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'typedef GLenum' -->
-          <parameter type-id='type-id-25'/>
+          <parameter type-id='type-id-28'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1682,9 +1682,9 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1693,11 +1693,11 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1706,11 +1706,11 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1719,11 +1719,11 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1732,11 +1732,11 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1745,15 +1745,15 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1762,15 +1762,15 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1779,7 +1779,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -1789,23 +1789,23 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1814,13 +1814,13 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1829,15 +1829,15 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1846,13 +1846,13 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1861,13 +1861,13 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1880,11 +1880,11 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1893,27 +1893,27 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1922,19 +1922,19 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1943,15 +1943,15 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1960,11 +1960,11 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1977,7 +1977,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1986,19 +1986,19 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL[3]*' -->
           <parameter type-id='type-id-57'/>
           <!-- parameter of type 'REAL[3]*' -->
           <parameter type-id='type-id-57'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2007,19 +2007,19 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL[3]*' -->
           <parameter type-id='type-id-57'/>
           <!-- parameter of type 'REAL[3]*' -->
           <parameter type-id='type-id-57'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2028,19 +2028,19 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2049,19 +2049,19 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2070,17 +2070,17 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2089,17 +2089,17 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2108,7 +2108,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -2118,23 +2118,23 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2143,7 +2143,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -2153,23 +2153,23 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2180,7 +2180,7 @@ 
           <!-- parameter of type 'bezierPatchMesh*' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2191,7 +2191,7 @@ 
           <!-- parameter of type 'bezierPatchMesh*' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2200,29 +2200,29 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2237,13 +2237,13 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2258,9 +2258,9 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2273,7 +2273,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2284,7 +2284,7 @@ 
           <!-- parameter of type 'bezierPatchMesh*' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2295,7 +2295,7 @@ 
           <!-- parameter of type 'bezierPatchMesh*' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes' vtable-offset='-1'>
@@ -2304,9 +2304,9 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='9'>
@@ -2315,13 +2315,13 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='10'>
@@ -2338,7 +2338,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='11'>
@@ -2347,9 +2347,9 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='12'>
@@ -2358,9 +2358,9 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='13'>
@@ -2369,9 +2369,9 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='14'>
@@ -2380,27 +2380,27 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='15'>
@@ -2409,19 +2409,19 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='16'>
@@ -2430,17 +2430,17 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='17'>
@@ -2449,13 +2449,13 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='18'>
@@ -2464,11 +2464,11 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='19'>
@@ -2477,7 +2477,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='20'>
@@ -2486,9 +2486,9 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='21'>
@@ -2497,7 +2497,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='22'>
@@ -2506,7 +2506,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='23'>
@@ -2515,7 +2515,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='24'>
@@ -2524,7 +2524,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='25'>
@@ -2533,7 +2533,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='26'>
@@ -2542,7 +2542,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='27'>
@@ -2551,7 +2551,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='28'>
@@ -2560,7 +2560,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='29'>
@@ -2569,7 +2569,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='30'>
@@ -2578,7 +2578,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='31'>
@@ -2587,7 +2587,7 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='32'>
@@ -2596,19 +2596,19 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='33'>
@@ -2617,19 +2617,19 @@ 
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='34'>
@@ -2642,11 +2642,11 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='35'>
@@ -2659,11 +2659,11 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='36'>
@@ -2676,11 +2676,11 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='37'>
@@ -2691,7 +2691,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='38'>
@@ -2702,7 +2702,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -2711,77 +2711,77 @@ 
     <!-- OpenGLSurfaceEvaluator* -->
     <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-55'/>
     <!-- float* -->
-    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-59'/>
+    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-59'/>
     <!-- void gluDeleteNurbsRenderer(GLUnurbs*) -->
     <function-decl name='gluDeleteNurbsRenderer' mangled-name='gluDeleteNurbsRenderer' filepath='libnurbs/interface/glinterface.cc' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDeleteNurbsRenderer'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluNurbsCallbackDataEXT(GLUnurbs*, void*) -->
     <function-decl name='gluNurbsCallbackDataEXT' mangled-name='gluNurbsCallbackDataEXT' filepath='libnurbs/interface/glinterface.cc' line='459' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCallbackDataEXT'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='userData' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
+      <parameter type-id='type-id-25' name='userData' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluNurbsCallbackData(GLUnurbs*, void*) -->
     <function-decl name='gluNurbsCallbackData' mangled-name='gluNurbsCallbackData' filepath='libnurbs/interface/glinterface.cc' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCallbackData'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='userData' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
+      <parameter type-id='type-id-25' name='userData' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluNurbsCallback(GLUnurbs*, GLenum, _GLUfuncptr) -->
     <function-decl name='gluNurbsCallback' mangled-name='gluNurbsCallback' filepath='libnurbs/interface/glinterface.cc' line='430' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCallback'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='which' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
+      <parameter type-id='type-id-28' name='which' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
       <!-- parameter of type 'typedef _GLUfuncptr' -->
-      <parameter type-id='type-id-26' name='fn' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
+      <parameter type-id='type-id-29' name='fn' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluGetNurbsProperty(GLUnurbs*, GLenum, GLfloat*) -->
     <function-decl name='gluGetNurbsProperty' mangled-name='gluGetNurbsProperty' filepath='libnurbs/interface/glinterface.cc' line='359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetNurbsProperty'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='property' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
+      <parameter type-id='type-id-28' name='property' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
       <!-- parameter of type 'GLfloat*' -->
       <parameter type-id='type-id-47' name='value' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluNurbsProperty(GLUnurbs*, GLenum, GLfloat) -->
     <function-decl name='gluNurbsProperty' mangled-name='gluNurbsProperty' filepath='libnurbs/interface/glinterface.cc' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsProperty'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='property' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
+      <parameter type-id='type-id-28' name='property' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
       <!-- parameter of type 'typedef GLfloat' -->
-      <parameter type-id='type-id-33' name='value' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
+      <parameter type-id='type-id-35' name='value' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluLoadSamplingMatrices(GLUnurbs*, const GLfloat*, const GLfloat*, const GLint*) -->
     <function-decl name='gluLoadSamplingMatrices' mangled-name='gluLoadSamplingMatrices' filepath='libnurbs/interface/glinterface.cc' line='235' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluLoadSamplingMatrices'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='235' column='1'/>
       <!-- parameter of type 'const GLfloat*' -->
-      <parameter type-id='type-id-28' name='modelMatrix' filepath='libnurbs/interface/glinterface.cc' line='235' column='1'/>
+      <parameter type-id='type-id-31' name='modelMatrix' filepath='libnurbs/interface/glinterface.cc' line='235' column='1'/>
       <!-- parameter of type 'const GLfloat*' -->
-      <parameter type-id='type-id-28' name='projMatrix' filepath='libnurbs/interface/glinterface.cc' line='236' column='1'/>
+      <parameter type-id='type-id-31' name='projMatrix' filepath='libnurbs/interface/glinterface.cc' line='236' column='1'/>
       <!-- parameter of type 'const GLint*' -->
       <parameter type-id='type-id-45' name='viewport' filepath='libnurbs/interface/glinterface.cc' line='237' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluNurbsSurface(GLUnurbs*, GLint, GLfloat*, GLint, GLfloat*, GLint, GLint, GLfloat*, GLint, GLint, GLenum) -->
     <function-decl name='gluNurbsSurface' mangled-name='gluNurbsSurface' filepath='libnurbs/interface/glinterface.cc' line='199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsSurface'>
@@ -2806,9 +2806,9 @@ 
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='torder' filepath='libnurbs/interface/glinterface.cc' line='202' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libnurbs/interface/glinterface.cc' line='203' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libnurbs/interface/glinterface.cc' line='203' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluNurbsCurve(GLUnurbs*, GLint, float*, GLint, float*, GLint, GLenum) -->
     <function-decl name='gluNurbsCurve' mangled-name='gluNurbsCurve' filepath='libnurbs/interface/glinterface.cc' line='173' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCurve'>
@@ -2825,9 +2825,9 @@ 
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='order' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluPwlCurve(GLUnurbs*, GLint, float*, GLint, GLenum) -->
     <function-decl name='gluPwlCurve' mangled-name='gluPwlCurve' filepath='libnurbs/interface/glinterface.cc' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluPwlCurve'>
@@ -2840,51 +2840,51 @@ 
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='stride' filepath='libnurbs/interface/glinterface.cc' line='151' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libnurbs/interface/glinterface.cc' line='151' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libnurbs/interface/glinterface.cc' line='151' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluEndTrim(GLUnurbs*) -->
     <function-decl name='gluEndTrim' mangled-name='gluEndTrim' filepath='libnurbs/interface/glinterface.cc' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndTrim'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluBeginTrim(GLUnurbs*) -->
     <function-decl name='gluBeginTrim' mangled-name='gluBeginTrim' filepath='libnurbs/interface/glinterface.cc' line='131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginTrim'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluEndSurface(GLUnurbs*) -->
     <function-decl name='gluEndSurface' mangled-name='gluEndSurface' filepath='libnurbs/interface/glinterface.cc' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndSurface'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluEndCurve(GLUnurbs*) -->
     <function-decl name='gluEndCurve' mangled-name='gluEndCurve' filepath='libnurbs/interface/glinterface.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndCurve'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluBeginCurve(GLUnurbs*) -->
     <function-decl name='gluBeginCurve' mangled-name='gluBeginCurve' filepath='libnurbs/interface/glinterface.cc' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginCurve'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluBeginSurface(GLUnurbs*) -->
     <function-decl name='gluBeginSurface' mangled-name='gluBeginSurface' filepath='libnurbs/interface/glinterface.cc' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginSurface'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- GLUnurbs* gluNewNurbsRenderer() -->
     <function-decl name='gluNewNurbsRenderer' mangled-name='gluNewNurbsRenderer' filepath='libnurbs/interface/glinterface.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewNurbsRenderer'>
@@ -2894,12 +2894,12 @@ 
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glrenderer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- GLfloat[4] -->
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='128' id='type-id-61'>
+    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='128' id='type-id-61'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
     </array-type-def>
     <!-- typedef void (typedef GLenum)* errorCallbackType -->
-    <typedef-decl name='errorCallbackType' type-id='type-id-16' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-41'/>
+    <typedef-decl name='errorCallbackType' type-id='type-id-19' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-41'/>
     <!-- class NurbsTessellator -->
     <class-decl name='NurbsTessellator' size-in-bits='47616' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='53' column='1' id='type-id-40'>
       <data-member access='protected' layout-offset-in-bits='64'>
@@ -2960,39 +2960,39 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='46720'>
         <!-- int NurbsTessellator::inSurface -->
-        <var-decl name='inSurface' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='148' column='1'/>
+        <var-decl name='inSurface' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='148' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46752'>
         <!-- int NurbsTessellator::inCurve -->
-        <var-decl name='inCurve' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='149' column='1'/>
+        <var-decl name='inCurve' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='149' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46784'>
         <!-- int NurbsTessellator::inTrim -->
-        <var-decl name='inTrim' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='150' column='1'/>
+        <var-decl name='inTrim' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='150' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46816'>
         <!-- int NurbsTessellator::isCurveModified -->
-        <var-decl name='isCurveModified' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='151' column='1'/>
+        <var-decl name='isCurveModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='151' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46848'>
         <!-- int NurbsTessellator::isTrimModified -->
-        <var-decl name='isTrimModified' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='152' column='1'/>
+        <var-decl name='isTrimModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='152' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46880'>
         <!-- int NurbsTessellator::isSurfaceModified -->
-        <var-decl name='isSurfaceModified' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='153' column='1'/>
+        <var-decl name='isSurfaceModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='153' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46912'>
         <!-- int NurbsTessellator::isDataValid -->
-        <var-decl name='isDataValid' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='154' column='1'/>
+        <var-decl name='isDataValid' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='154' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46944'>
         <!-- int NurbsTessellator::numTrims -->
-        <var-decl name='numTrims' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='155' column='1'/>
+        <var-decl name='numTrims' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='155' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46976'>
         <!-- int NurbsTessellator::playBack -->
-        <var-decl name='playBack' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='156' column='1'/>
+        <var-decl name='playBack' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='156' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47040'>
         <!-- O_trim** NurbsTessellator::nextTrim -->
@@ -3040,7 +3040,7 @@ 
           <!-- parameter of type 'BasicSurfaceEvaluator&' -->
           <parameter type-id='type-id-81'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3049,11 +3049,11 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3062,13 +3062,13 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3077,11 +3077,11 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float' -->
-          <parameter type-id='type-id-30'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3090,13 +3090,13 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float' -->
-          <parameter type-id='type-id-30'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3105,13 +3105,13 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3120,17 +3120,17 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3139,9 +3139,9 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3150,7 +3150,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3159,7 +3159,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3168,7 +3168,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3177,9 +3177,9 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3188,7 +3188,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3197,15 +3197,15 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3214,19 +3214,19 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3235,27 +3235,27 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3264,13 +3264,13 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3279,7 +3279,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3288,9 +3288,9 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3299,7 +3299,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void* -->
-          <return type-id='type-id-22'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3308,7 +3308,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3317,9 +3317,9 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3330,7 +3330,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3341,7 +3341,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3350,9 +3350,9 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3361,7 +3361,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3374,7 +3374,7 @@ 
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-83'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3383,9 +3383,9 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3396,7 +3396,7 @@ 
           <!-- parameter of type 'O_curve*' -->
           <parameter type-id='type-id-77'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3405,7 +3405,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3414,7 +3414,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3425,7 +3425,7 @@ 
           <!-- parameter of type 'O_curve*' -->
           <parameter type-id='type-id-77'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3436,7 +3436,7 @@ 
           <!-- parameter of type 'O_trim*' -->
           <parameter type-id='type-id-76'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3447,7 +3447,7 @@ 
           <!-- parameter of type 'O_curve*' -->
           <parameter type-id='type-id-77'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3458,7 +3458,7 @@ 
           <!-- parameter of type 'O_pwlcurve*' -->
           <parameter type-id='type-id-84'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3469,7 +3469,7 @@ 
           <!-- parameter of type 'O_nurbscurve*' -->
           <parameter type-id='type-id-85'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3480,7 +3480,7 @@ 
           <!-- parameter of type 'O_nurbssurface*' -->
           <parameter type-id='type-id-86'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3491,7 +3491,7 @@ 
           <!-- parameter of type 'O_surface*' -->
           <parameter type-id='type-id-75'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3502,7 +3502,7 @@ 
           <!-- parameter of type 'O_surface*' -->
           <parameter type-id='type-id-75'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3511,7 +3511,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3522,7 +3522,7 @@ 
           <!-- parameter of type 'O_trim*' -->
           <parameter type-id='type-id-76'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3531,7 +3531,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3542,7 +3542,7 @@ 
           <!-- parameter of type 'O_pwlcurve*' -->
           <parameter type-id='type-id-84'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3553,7 +3553,7 @@ 
           <!-- parameter of type 'O_nurbscurve*' -->
           <parameter type-id='type-id-85'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3564,7 +3564,7 @@ 
           <!-- parameter of type 'O_nurbssurface*' -->
           <parameter type-id='type-id-86'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3575,7 +3575,7 @@ 
           <!-- parameter of type 'Property*' -->
           <parameter type-id='type-id-87'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3586,7 +3586,7 @@ 
           <!-- parameter of type 'Property*' -->
           <parameter type-id='type-id-87'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3597,7 +3597,7 @@ 
           <!-- parameter of type 'Property*' -->
           <parameter type-id='type-id-87'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
@@ -3606,9 +3606,9 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
@@ -3617,7 +3617,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='3'>
@@ -3626,7 +3626,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='4'>
@@ -3635,9 +3635,9 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='5'>
@@ -3646,7 +3646,7 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='6'>
@@ -3655,9 +3655,9 @@ 
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -3698,7 +3698,7 @@ 
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
     </array-type-def>
     <!-- long int[2] -->
-    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='128' id='type-id-94'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='128' id='type-id-94'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
     </array-type-def>
@@ -3706,7 +3706,7 @@ 
     <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-95'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- int StoredVertex::type -->
-        <var-decl name='type' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='95' column='1'/>
+        <var-decl name='type' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='95' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='32'>
         <!-- REAL StoredVertex::coord[2] -->
@@ -3722,7 +3722,7 @@ 
           <!-- implicit parameter of type 'StoredVertex*' -->
           <parameter type-id='type-id-93' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -3731,9 +3731,9 @@ 
           <!-- implicit parameter of type 'StoredVertex*' -->
           <parameter type-id='type-id-93' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3746,7 +3746,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3755,11 +3755,11 @@ 
           <!-- implicit parameter of type 'StoredVertex*' -->
           <parameter type-id='type-id-93' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3770,23 +3770,23 @@ 
           <!-- parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct BasicSurfaceEvaluator -->
     <class-decl name='BasicSurfaceEvaluator' size-in-bits='64' is-struct='yes' visibility='default' filepath='libnurbs/internals/basicsurfeval.h' line='43' column='1' id='type-id-48'>
       <!-- class CachingEvaluator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-8'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-7'/>
       <member-function access='public' destructor='yes' vtable-offset='-1'>
         <!-- BasicSurfaceEvaluator::~BasicSurfaceEvaluator(int) -->
         <function-decl name='~BasicSurfaceEvaluator' filepath='libnurbs/internals/basicsurfeval.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='9'>
@@ -3795,13 +3795,13 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='10'>
@@ -3818,7 +3818,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='11'>
@@ -3827,9 +3827,9 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='12'>
@@ -3838,9 +3838,9 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='13'>
@@ -3849,9 +3849,9 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='14'>
@@ -3860,27 +3860,27 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='15'>
@@ -3889,19 +3889,19 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='16'>
@@ -3910,17 +3910,17 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='17'>
@@ -3929,13 +3929,13 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='18'>
@@ -3944,11 +3944,11 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='19'>
@@ -3957,7 +3957,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='20'>
@@ -3966,9 +3966,9 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='21'>
@@ -3977,7 +3977,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='22'>
@@ -3986,7 +3986,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='23'>
@@ -3995,7 +3995,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='24'>
@@ -4004,7 +4004,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='25'>
@@ -4013,7 +4013,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='26'>
@@ -4022,7 +4022,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='27'>
@@ -4031,7 +4031,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='28'>
@@ -4040,7 +4040,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='29'>
@@ -4049,7 +4049,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='30'>
@@ -4058,7 +4058,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='31'>
@@ -4067,7 +4067,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='32'>
@@ -4076,19 +4076,19 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='33'>
@@ -4097,19 +4097,19 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='34'>
@@ -4122,11 +4122,11 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='35'>
@@ -4139,11 +4139,11 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='36'>
@@ -4156,11 +4156,11 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='37'>
@@ -4171,7 +4171,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='38'>
@@ -4182,7 +4182,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -4220,27 +4220,27 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- int bezierPatchMesh::size_UVarray -->
-        <var-decl name='size_UVarray' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='50' column='1'/>
+        <var-decl name='size_UVarray' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='480'>
         <!-- int bezierPatchMesh::index_UVarray -->
-        <var-decl name='index_UVarray' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='51' column='1'/>
+        <var-decl name='index_UVarray' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int bezierPatchMesh::size_length_array -->
-        <var-decl name='size_length_array' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='52' column='1'/>
+        <var-decl name='size_length_array' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='544'>
         <!-- int bezierPatchMesh::index_length_array -->
-        <var-decl name='index_length_array' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='53' column='1'/>
+        <var-decl name='index_length_array' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='53' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- int bezierPatchMesh::counter -->
-        <var-decl name='counter' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='55' column='1'/>
+        <var-decl name='counter' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
         <!-- GLenum bezierPatchMesh::type -->
-        <var-decl name='type' type-id='type-id-25' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='56' column='1'/>
+        <var-decl name='type' type-id='type-id-28' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- float* bezierPatchMesh::vertex_array -->
@@ -4269,31 +4269,31 @@ 
     <class-decl name='bezierPatch' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='36' column='1' id='type-id-102'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- float bezierPatch::umin -->
-        <var-decl name='umin' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+        <var-decl name='umin' type-id='type-id-33' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- float bezierPatch::vmin -->
-        <var-decl name='vmin' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+        <var-decl name='vmin' type-id='type-id-33' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- float bezierPatch::umax -->
-        <var-decl name='umax' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+        <var-decl name='umax' type-id='type-id-33' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- float bezierPatch::vmax -->
-        <var-decl name='vmax' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+        <var-decl name='vmax' type-id='type-id-33' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int bezierPatch::uorder -->
-        <var-decl name='uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='38' column='1'/>
+        <var-decl name='uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int bezierPatch::vorder -->
-        <var-decl name='vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='39' column='1'/>
+        <var-decl name='vorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int bezierPatch::dimension -->
-        <var-decl name='dimension' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='57' column='1'/>
+        <var-decl name='dimension' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- float* bezierPatch::ctlpoints -->
@@ -4318,7 +4318,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int surfEvalMachine::k -->
-        <var-decl name='k' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='66' column='1'/>
+        <var-decl name='k' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- REAL surfEvalMachine::u1 -->
@@ -4330,11 +4330,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int surfEvalMachine::ustride -->
-        <var-decl name='ustride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='69' column='1'/>
+        <var-decl name='ustride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int surfEvalMachine::uorder -->
-        <var-decl name='uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='70' column='1'/>
+        <var-decl name='uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- REAL surfEvalMachine::v1 -->
@@ -4346,11 +4346,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int surfEvalMachine::vstride -->
-        <var-decl name='vstride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='73' column='1'/>
+        <var-decl name='vstride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int surfEvalMachine::vorder -->
-        <var-decl name='vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='74' column='1'/>
+        <var-decl name='vorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
         <!-- REAL surfEvalMachine::ctlPoints[6400] -->
@@ -4376,7 +4376,7 @@ 
     <!-- BasicSurfaceEvaluator* -->
     <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-96'/>
     <!-- GLenum* -->
-    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-101'/>
+    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-101'/>
     <!-- REAL[3]* -->
     <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-57'/>
     <!-- StoredVertex* -->
@@ -4388,7 +4388,7 @@ 
     <!-- bezierPatchMesh* -->
     <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-51'/>
     <!-- int* -->
-    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-100'/>
+    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-100'/>
     <!-- surfEvalMachine* -->
     <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-58'/>
     <!-- struct SurfaceMap -->
@@ -4442,11 +4442,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- long int Arc::type -->
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/arc.h' line='66' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- long int Arc::nuid -->
-        <var-decl name='nuid' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/arc.h' line='67' column='1'/>
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='67' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Arc::Arc(Arc*, PwlArc*) -->
@@ -4458,7 +4458,7 @@ 
           <!-- parameter of type 'PwlArc*' -->
           <parameter type-id='type-id-115'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -4469,9 +4469,9 @@ 
           <!-- parameter of type 'enum arc_side' -->
           <parameter type-id='type-id-117'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4491,7 +4491,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4500,7 +4500,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4509,7 +4509,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4518,7 +4518,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4527,7 +4527,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4538,7 +4538,7 @@ 
           <!-- parameter of type 'Arc_ptr*' -->
           <parameter type-id='type-id-118'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4547,7 +4547,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4556,7 +4556,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4569,7 +4569,7 @@ 
           <!-- parameter of type 'enum arc_side' -->
           <parameter type-id='type-id-117'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4578,7 +4578,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4587,7 +4587,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4596,7 +4596,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4605,7 +4605,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4614,7 +4614,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4632,7 +4632,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- REAL* -->
-          <return type-id='type-id-13'/>
+          <return type-id='type-id-16'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4641,7 +4641,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- REAL* -->
-          <return type-id='type-id-13'/>
+          <return type-id='type-id-16'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4650,7 +4650,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- REAL* -->
-          <return type-id='type-id-13'/>
+          <return type-id='type-id-16'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4659,7 +4659,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4668,7 +4668,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4677,7 +4677,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4686,7 +4686,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4697,7 +4697,7 @@ 
           <!-- parameter of type 'enum arc_side' -->
           <parameter type-id='type-id-117'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4715,7 +4715,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4724,7 +4724,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4733,7 +4733,7 @@ 
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -4742,7 +4742,7 @@ 
       <member-type access='protected'>
         <!-- enum Pool::Magic -->
         <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-120'>
-          <underlying-type type-id='type-id-38'/>
+          <underlying-type type-id='type-id-9'/>
           <enumerator name='is_allocated' value='62369'/>
           <enumerator name='is_free' value='61858'/>
         </enum-decl>
@@ -4757,7 +4757,7 @@ 
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2112'>
         <!-- int Pool::nextblock -->
-        <var-decl name='nextblock' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='64' column='1'/>
+        <var-decl name='nextblock' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='64' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2176'>
         <!-- char* Pool::curblock -->
@@ -4765,19 +4765,19 @@ 
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2240'>
         <!-- int Pool::buffersize -->
-        <var-decl name='buffersize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='66' column='1'/>
+        <var-decl name='buffersize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='66' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2272'>
         <!-- int Pool::nextsize -->
-        <var-decl name='nextsize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='67' column='1'/>
+        <var-decl name='nextsize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='67' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2304'>
         <!-- int Pool::nextfree -->
-        <var-decl name='nextfree' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='68' column='1'/>
+        <var-decl name='nextfree' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='68' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2336'>
         <!-- int Pool::initsize -->
-        <var-decl name='initsize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='69' column='1'/>
+        <var-decl name='initsize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='69' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2368'>
         <!-- const char* Pool::name -->
@@ -4793,13 +4793,13 @@ 
           <!-- implicit parameter of type 'Pool*' -->
           <parameter type-id='type-id-122' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-83'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -4808,9 +4808,9 @@ 
           <!-- implicit parameter of type 'Pool*' -->
           <parameter type-id='type-id-122' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4819,7 +4819,7 @@ 
           <!-- implicit parameter of type 'Pool*' -->
           <parameter type-id='type-id-122' is-artificial='yes'/>
           <!-- void* -->
-          <return type-id='type-id-22'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4828,9 +4828,9 @@ 
           <!-- implicit parameter of type 'Pool*' -->
           <parameter type-id='type-id-122' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4839,7 +4839,7 @@ 
           <!-- implicit parameter of type 'Pool*' -->
           <parameter type-id='type-id-122' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4848,7 +4848,7 @@ 
           <!-- implicit parameter of type 'Pool*' -->
           <parameter type-id='type-id-122' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -4871,7 +4871,7 @@ 
           <!-- parameter of type 'Pool&' -->
           <parameter type-id='type-id-125'/>
           <!-- void* -->
-          <return type-id='type-id-22'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -4880,9 +4880,9 @@ 
           <!-- parameter of type 'typedef size_t' -->
           <parameter type-id='type-id-123'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void* -->
-          <return type-id='type-id-22'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -4891,27 +4891,27 @@ 
           <!-- parameter of type 'typedef size_t' -->
           <parameter type-id='type-id-123'/>
           <!-- void* -->
-          <return type-id='type-id-22'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <!-- void PooledObj::operator delete() -->
         <function-decl name='operator delete' mangled-name='_ZN9PooledObjdlEPv' filepath='libnurbs/internals/bufpool.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <!-- void PooledObj::operator delete(Pool&) -->
         <function-decl name='operator delete' mangled-name='_ZN9PooledObjdlEPvR4Pool' filepath='libnurbs/internals/bufpool.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- parameter of type 'Pool&' -->
           <parameter type-id='type-id-125'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4922,7 +4922,7 @@ 
           <!-- parameter of type 'Pool&' -->
           <parameter type-id='type-id-125'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -4930,7 +4930,7 @@ 
     <typedef-decl name='Arc_ptr' type-id='type-id-116' filepath='libnurbs/internals/arc.h' line='50' column='1' id='type-id-113'/>
     <!-- enum arc_side -->
     <enum-decl name='arc_side' filepath='libnurbs/internals/arc.h' line='52' column='1' id='type-id-117'>
-      <underlying-type type-id='type-id-38'/>
+      <underlying-type type-id='type-id-9'/>
       <enumerator name='arc_none' value='0'/>
       <enumerator name='arc_right' value='1'/>
       <enumerator name='arc_top' value='2'/>
@@ -4947,11 +4947,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- int PwlArc::npts -->
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='47' column='1'/>
+        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='47' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- long int PwlArc::type -->
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='48' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='48' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- PwlArc::PwlArc() -->
@@ -4959,7 +4959,7 @@ 
           <!-- implicit parameter of type 'PwlArc*' -->
           <parameter type-id='type-id-115' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -4968,11 +4968,11 @@ 
           <!-- implicit parameter of type 'PwlArc*' -->
           <parameter type-id='type-id-115' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -4981,13 +4981,13 @@ 
           <!-- implicit parameter of type 'PwlArc*' -->
           <parameter type-id='type-id-115' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -4999,7 +4999,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int TrimVertex::nuid -->
-        <var-decl name='nuid' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='50' column='1'/>
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='50' column='1'/>
       </data-member>
     </class-decl>
     <!-- Arc* -->
@@ -5027,7 +5027,7 @@ 
     <!-- const char* -->
     <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-83'/>
     <!-- const int -->
-    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-112'/>
+    <qualified-type-def type-id='type-id-11' const='yes' id='type-id-112'/>
     <!-- struct BezierArc -->
     <class-decl name='BezierArc' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-129'/>
   </abi-instr>
@@ -5058,11 +5058,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- int Curvelist::needsSubdivision -->
-        <var-decl name='needsSubdivision' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curvelist.h' line='59' column='1'/>
+        <var-decl name='needsSubdivision' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curvelist.h' line='59' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- float Curvelist::stepsize -->
-        <var-decl name='stepsize' type-id='type-id-30' visibility='default' filepath='libnurbs/internals/curvelist.h' line='60' column='1'/>
+        <var-decl name='stepsize' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/curvelist.h' line='60' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Curvelist::Curvelist(Quilt*, REAL, REAL) -->
@@ -5076,7 +5076,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -5089,7 +5089,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
@@ -5098,9 +5098,9 @@ 
           <!-- implicit parameter of type 'Curvelist*' -->
           <parameter type-id='type-id-138' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5109,7 +5109,7 @@ 
           <!-- implicit parameter of type 'Curvelist*' -->
           <parameter type-id='type-id-138' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5118,7 +5118,7 @@ 
           <!-- implicit parameter of type 'Curvelist*' -->
           <parameter type-id='type-id-138' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5127,7 +5127,7 @@ 
           <!-- implicit parameter of type 'Curvelist*' -->
           <parameter type-id='type-id-138' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5151,19 +5151,19 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int Renderhints::displaydomain -->
-        <var-decl name='displaydomain' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='54' column='1'/>
+        <var-decl name='displaydomain' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int Renderhints::maxsubdivisions -->
-        <var-decl name='maxsubdivisions' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='55' column='1'/>
+        <var-decl name='maxsubdivisions' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int Renderhints::wiretris -->
-        <var-decl name='wiretris' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='56' column='1'/>
+        <var-decl name='wiretris' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- int Renderhints::wirequads -->
-        <var-decl name='wirequads' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='57' column='1'/>
+        <var-decl name='wirequads' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='57' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Renderhints::Renderhints() -->
@@ -5171,7 +5171,7 @@ 
           <!-- implicit parameter of type 'Renderhints*' -->
           <parameter type-id='type-id-141' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5180,7 +5180,7 @@ 
           <!-- implicit parameter of type 'Renderhints*' -->
           <parameter type-id='type-id-141' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5189,9 +5189,9 @@ 
           <!-- implicit parameter of type 'Renderhints*' -->
           <parameter type-id='type-id-141' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5200,7 +5200,7 @@ 
           <!-- implicit parameter of type 'Renderhints*' -->
           <parameter type-id='type-id-141' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- typedef REAL -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -5211,11 +5211,11 @@ 
           <!-- implicit parameter of type 'Renderhints*' -->
           <parameter type-id='type-id-141' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5223,7 +5223,7 @@ 
     <class-decl name='Sorter' size-in-bits='128' visibility='default' filepath='libnurbs/internals/sorter.h' line='36' column='1' id='type-id-142'>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- int Sorter::es -->
-        <var-decl name='es' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/sorter.h' line='49' column='1'/>
+        <var-decl name='es' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/sorter.h' line='49' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Sorter::Sorter(int) -->
@@ -5231,9 +5231,9 @@ 
           <!-- implicit parameter of type 'Sorter*' -->
           <parameter type-id='type-id-143' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5242,11 +5242,11 @@ 
           <!-- implicit parameter of type 'Sorter*' -->
           <parameter type-id='type-id-143' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5259,7 +5259,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
@@ -5268,9 +5268,9 @@ 
           <!-- implicit parameter of type 'Sorter*' -->
           <parameter type-id='type-id-143' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='2'>
@@ -5283,7 +5283,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='3'>
@@ -5296,7 +5296,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='4'>
@@ -5311,7 +5311,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5331,7 +5331,7 @@ 
           <!-- parameter of type 'Subdivider&' -->
           <parameter type-id='type-id-147'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5342,9 +5342,9 @@ 
           <!-- parameter of type 'Arc**' -->
           <parameter type-id='type-id-148'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='2'>
@@ -5357,7 +5357,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='3'>
@@ -5370,7 +5370,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='4'>
@@ -5385,7 +5385,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5399,7 +5399,7 @@ 
           <!-- implicit parameter of type 'FlistSorter*' -->
           <parameter type-id='type-id-150' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5408,11 +5408,11 @@ 
           <!-- implicit parameter of type 'FlistSorter*' -->
           <parameter type-id='type-id-150' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
@@ -5421,9 +5421,9 @@ 
           <!-- implicit parameter of type 'FlistSorter*' -->
           <parameter type-id='type-id-150' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='2'>
@@ -5436,7 +5436,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='3'>
@@ -5449,7 +5449,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='4'>
@@ -5464,7 +5464,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5472,19 +5472,19 @@ 
     <class-decl name='Flist' size-in-bits='320' visibility='default' filepath='libnurbs/internals/flist.h' line='42' column='1' id='type-id-151'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- REAL* Flist::pts -->
-        <var-decl name='pts' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
+        <var-decl name='pts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- int Flist::npts -->
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='45' column='1'/>
+        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='45' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96'>
         <!-- int Flist::start -->
-        <var-decl name='start' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='46' column='1'/>
+        <var-decl name='start' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='46' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Flist::end -->
-        <var-decl name='end' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='47' column='1'/>
+        <var-decl name='end' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='47' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='192'>
         <!-- FlistSorter Flist::sorter -->
@@ -5496,7 +5496,7 @@ 
           <!-- implicit parameter of type 'Flist*' -->
           <parameter type-id='type-id-152' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -5505,9 +5505,9 @@ 
           <!-- implicit parameter of type 'Flist*' -->
           <parameter type-id='type-id-152' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5518,7 +5518,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5527,7 +5527,7 @@ 
           <!-- implicit parameter of type 'Flist*' -->
           <parameter type-id='type-id-152' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5536,9 +5536,9 @@ 
           <!-- implicit parameter of type 'Flist*' -->
           <parameter type-id='type-id-152' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5551,7 +5551,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5567,11 +5567,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='2560'>
         <!-- int TrimVertexPool::nextvlistslot -->
-        <var-decl name='nextvlistslot' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='54' column='1'/>
+        <var-decl name='nextvlistslot' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='54' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2592'>
         <!-- int TrimVertexPool::vlistsize -->
-        <var-decl name='vlistsize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='55' column='1'/>
+        <var-decl name='vlistsize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='55' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- TrimVertexPool::TrimVertexPool() -->
@@ -5579,7 +5579,7 @@ 
           <!-- implicit parameter of type 'TrimVertexPool*' -->
           <parameter type-id='type-id-154' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
@@ -5588,9 +5588,9 @@ 
           <!-- implicit parameter of type 'TrimVertexPool*' -->
           <parameter type-id='type-id-154' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5599,7 +5599,7 @@ 
           <!-- implicit parameter of type 'TrimVertexPool*' -->
           <parameter type-id='type-id-154' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5608,7 +5608,7 @@ 
           <!-- implicit parameter of type 'TrimVertexPool*' -->
           <parameter type-id='type-id-154' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- TrimVertex* -->
           <return type-id='type-id-119'/>
         </function-decl>
@@ -5630,7 +5630,7 @@ 
           <!-- implicit parameter of type 'Bin*' -->
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -5639,9 +5639,9 @@ 
           <!-- implicit parameter of type 'Bin*' -->
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5677,7 +5677,7 @@ 
           <!-- implicit parameter of type 'Bin*' -->
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5688,7 +5688,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5699,7 +5699,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5708,7 +5708,7 @@ 
           <!-- implicit parameter of type 'Bin*' -->
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5717,7 +5717,7 @@ 
           <!-- implicit parameter of type 'Bin*' -->
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5726,7 +5726,7 @@ 
           <!-- implicit parameter of type 'Bin*' -->
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5737,7 +5737,7 @@ 
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-83'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5746,7 +5746,7 @@ 
           <!-- implicit parameter of type 'Bin*' -->
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5774,7 +5774,7 @@ 
           <!-- parameter of type 'Pool&' -->
           <parameter type-id='type-id-125'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -5783,9 +5783,9 @@ 
           <!-- implicit parameter of type 'ArcTessellator*' -->
           <parameter type-id='type-id-160' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5804,7 +5804,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5825,7 +5825,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5844,7 +5844,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5863,7 +5863,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5882,7 +5882,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5901,7 +5901,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5916,9 +5916,9 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5933,9 +5933,9 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -5944,11 +5944,11 @@ 
           <!-- parameter of type 'BezierArc*' -->
           <parameter type-id='type-id-114'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5962,7 +5962,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- REAL* Quilt::cpts -->
-        <var-decl name='cpts' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/quilt.h' line='68' column='1'/>
+        <var-decl name='cpts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/quilt.h' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- Quiltspec Quilt::qspec[2] -->
@@ -5984,7 +5984,7 @@ 
           <!-- parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5995,7 +5995,7 @@ 
           <!-- parameter of type 'Pool&' -->
           <parameter type-id='type-id-125'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6008,9 +6008,9 @@ 
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6025,9 +6025,9 @@ 
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6036,11 +6036,11 @@ 
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6049,7 +6049,7 @@ 
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6060,7 +6060,7 @@ 
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6069,13 +6069,13 @@ 
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6084,7 +6084,7 @@ 
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6093,15 +6093,15 @@ 
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'Flist&' -->
           <parameter type-id='type-id-168'/>
           <!-- parameter of type 'Flist&' -->
           <parameter type-id='type-id-168'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6110,15 +6110,15 @@ 
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'Flist&' -->
           <parameter type-id='type-id-168'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6127,13 +6127,13 @@ 
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'Flist&' -->
           <parameter type-id='type-id-168'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6146,9 +6146,9 @@ 
           <!-- parameter of type 'Flist&' -->
           <parameter type-id='type-id-168'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6161,7 +6161,7 @@ 
           <!-- parameter of type 'Flist&' -->
           <parameter type-id='type-id-168'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6170,7 +6170,7 @@ 
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -6179,7 +6179,7 @@ 
       <member-type access='private'>
         <!-- enum Subdivider::dir -->
         <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-169'>
-          <underlying-type type-id='type-id-38'/>
+          <underlying-type type-id='type-id-9'/>
           <enumerator name='down' value='0'/>
           <enumerator name='same' value='1'/>
           <enumerator name='up' value='2'/>
@@ -6232,11 +6232,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='18688'>
         <!-- int Subdivider::s_index -->
-        <var-decl name='s_index' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='125' column='1'/>
+        <var-decl name='s_index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='125' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18720'>
         <!-- int Subdivider::t_index -->
-        <var-decl name='t_index' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='126' column='1'/>
+        <var-decl name='t_index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='126' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18752'>
         <!-- Quilt* Subdivider::qlist -->
@@ -6264,11 +6264,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='20224'>
         <!-- int Subdivider::showDegenerate -->
-        <var-decl name='showDegenerate' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='133' column='1'/>
+        <var-decl name='showDegenerate' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='133' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20256'>
         <!-- int Subdivider::isArcTypeBezier -->
-        <var-decl name='isArcTypeBezier' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='134' column='1'/>
+        <var-decl name='isArcTypeBezier' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='134' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20288'>
         <!-- REAL Subdivider::domain_distance_u_rate -->
@@ -6280,7 +6280,7 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='20352'>
         <!-- int Subdivider::is_domain_distance_sampling -->
-        <var-decl name='is_domain_distance_sampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='190' column='1'/>
+        <var-decl name='is_domain_distance_sampling' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='190' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Subdivider::Subdivider(Renderhints&, Backend&) -->
@@ -6292,7 +6292,7 @@ 
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -6301,9 +6301,9 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6312,7 +6312,7 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6321,7 +6321,7 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6330,7 +6330,7 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6339,13 +6339,13 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6354,13 +6354,13 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6369,7 +6369,7 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6378,7 +6378,7 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6387,7 +6387,7 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6398,7 +6398,7 @@ 
           <!-- parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6407,7 +6407,7 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6416,7 +6416,7 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6425,9 +6425,9 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6440,7 +6440,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6453,7 +6453,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6466,7 +6466,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6479,7 +6479,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6490,7 +6490,7 @@ 
           <!-- parameter of type 'JumpBuffer*' -->
           <parameter type-id='type-id-67'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6501,7 +6501,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6512,7 +6512,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6521,9 +6521,9 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6540,7 +6540,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6557,7 +6557,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6574,7 +6574,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6591,7 +6591,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6608,7 +6608,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6625,7 +6625,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6642,7 +6642,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6659,7 +6659,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6672,7 +6672,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6685,7 +6685,7 @@ 
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6696,7 +6696,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6709,7 +6709,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6720,9 +6720,9 @@ 
           <!-- parameter of type 'Curvelist&' -->
           <parameter type-id='type-id-140'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6733,7 +6733,7 @@ 
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6744,11 +6744,11 @@ 
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6759,11 +6759,11 @@ 
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6776,11 +6776,11 @@ 
           <!-- parameter of type 'Patchlist&' -->
           <parameter type-id='type-id-176'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6793,11 +6793,11 @@ 
           <!-- parameter of type 'Patchlist&' -->
           <parameter type-id='type-id-176'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6810,7 +6810,7 @@ 
           <!-- parameter of type 'Patchlist&' -->
           <parameter type-id='type-id-176'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6821,11 +6821,11 @@ 
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6836,11 +6836,11 @@ 
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6851,7 +6851,7 @@ 
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6862,7 +6862,7 @@ 
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6873,7 +6873,7 @@ 
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6888,11 +6888,11 @@ 
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6911,7 +6911,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6920,7 +6920,7 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6929,7 +6929,7 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6938,7 +6938,7 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6947,7 +6947,7 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6956,7 +6956,7 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6965,7 +6965,7 @@ 
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6978,7 +6978,7 @@ 
           <!-- parameter of type 'const REAL*' -->
           <parameter type-id='type-id-177'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6989,15 +6989,15 @@ 
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'const REAL*' -->
           <parameter type-id='type-id-177'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7016,11 +7016,11 @@ 
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7031,7 +7031,7 @@ 
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7042,7 +7042,7 @@ 
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7057,9 +7057,9 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -7078,7 +7078,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -7091,7 +7091,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7108,7 +7108,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7125,7 +7125,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7136,13 +7136,13 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7155,7 +7155,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7168,7 +7168,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7185,7 +7185,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7198,7 +7198,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7223,11 +7223,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- int Patchlist::notInBbox -->
-        <var-decl name='notInBbox' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patchlist.h' line='64' column='1'/>
+        <var-decl name='notInBbox' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patchlist.h' line='64' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96'>
         <!-- int Patchlist::needsSampling -->
-        <var-decl name='needsSampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patchlist.h' line='65' column='1'/>
+        <var-decl name='needsSampling' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patchlist.h' line='65' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- Pspec Patchlist::pspec[2] -->
@@ -7241,11 +7241,11 @@ 
           <!-- parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -7256,11 +7256,11 @@ 
           <!-- parameter of type 'Patchlist&' -->
           <parameter type-id='type-id-176'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
@@ -7269,9 +7269,9 @@ 
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7280,7 +7280,7 @@ 
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7289,7 +7289,7 @@ 
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7298,7 +7298,7 @@ 
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7307,7 +7307,7 @@ 
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7316,7 +7316,7 @@ 
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7325,9 +7325,9 @@ 
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7336,7 +7336,7 @@ 
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- typedef REAL -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -7347,9 +7347,9 @@ 
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7358,7 +7358,7 @@ 
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7367,7 +7367,7 @@ 
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -7395,15 +7395,15 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='5408'>
         <!-- int Slicer::isolines -->
-        <var-decl name='isolines' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/slicer.h' line='75' column='1'/>
+        <var-decl name='isolines' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='75' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5440'>
         <!-- int Slicer::ulinear -->
-        <var-decl name='ulinear' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/slicer.h' line='81' column='1'/>
+        <var-decl name='ulinear' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='81' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5472'>
         <!-- int Slicer::vlinear -->
-        <var-decl name='vlinear' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/slicer.h' line='82' column='1'/>
+        <var-decl name='vlinear' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='82' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Slicer::Slicer(int, void**, Backend&) -->
@@ -7411,13 +7411,13 @@ 
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -7426,11 +7426,11 @@ 
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7441,7 +7441,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7452,7 +7452,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7463,7 +7463,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7474,7 +7474,7 @@ 
           <!-- parameter of type 'primStream*' -->
           <parameter type-id='type-id-186'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7487,7 +7487,7 @@ 
           <!-- parameter of type 'gridWrap*' -->
           <parameter type-id='type-id-188'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7498,7 +7498,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7511,7 +7511,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7520,9 +7520,9 @@ 
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7531,9 +7531,9 @@ 
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7542,9 +7542,9 @@ 
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7553,7 +7553,7 @@ 
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7562,7 +7562,7 @@ 
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7571,9 +7571,9 @@ 
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -7589,15 +7589,15 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Backend::wireframetris -->
-        <var-decl name='wireframetris' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='105' column='1'/>
+        <var-decl name='wireframetris' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='105' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- int Backend::wireframequads -->
-        <var-decl name='wireframequads' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='106' column='1'/>
+        <var-decl name='wireframequads' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='106' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- int Backend::npts -->
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='107' column='1'/>
+        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='107' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <!-- REAL Backend::mesh[3][4] -->
@@ -7605,7 +7605,7 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='608'>
         <!-- int Backend::meshindex -->
-        <var-decl name='meshindex' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='109' column='1'/>
+        <var-decl name='meshindex' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='109' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Backend::Backend(BasicCurveEvaluator&, BasicSurfaceEvaluator&) -->
@@ -7617,7 +7617,7 @@ 
           <!-- parameter of type 'BasicSurfaceEvaluator&' -->
           <parameter type-id='type-id-81'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7626,13 +7626,13 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7649,7 +7649,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7658,17 +7658,17 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -7678,7 +7678,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7687,13 +7687,13 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7706,15 +7706,15 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7723,15 +7723,15 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7742,7 +7742,7 @@ 
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-83'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7751,7 +7751,7 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7760,7 +7760,7 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7771,7 +7771,7 @@ 
           <!-- parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7782,7 +7782,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7793,7 +7793,7 @@ 
           <!-- parameter of type 'GridVertex*' -->
           <parameter type-id='type-id-194'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7806,7 +7806,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7817,7 +7817,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7828,7 +7828,7 @@ 
           <!-- parameter of type 'GridVertex*' -->
           <parameter type-id='type-id-194'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7837,7 +7837,7 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7846,7 +7846,7 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7855,7 +7855,7 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7870,7 +7870,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7879,7 +7879,7 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7888,7 +7888,7 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7897,7 +7897,7 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7906,7 +7906,7 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7915,19 +7915,19 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7936,19 +7936,19 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7959,7 +7959,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7970,7 +7970,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7981,7 +7981,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7992,7 +7992,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8003,7 +8003,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8012,7 +8012,7 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8025,7 +8025,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8034,19 +8034,19 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8059,9 +8059,9 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8070,11 +8070,11 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8085,7 +8085,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8094,7 +8094,7 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8103,7 +8103,7 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8112,7 +8112,7 @@ 
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8128,7 +8128,7 @@ 
           <!-- parameter of type 'Subdivider&' -->
           <parameter type-id='type-id-147'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
@@ -8141,7 +8141,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8157,7 +8157,7 @@ 
           <!-- parameter of type 'Subdivider&' -->
           <parameter type-id='type-id-147'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
@@ -8170,7 +8170,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8258,7 +8258,7 @@ 
           <!-- implicit parameter of type 'GridVertex*' -->
           <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -8267,11 +8267,11 @@ 
           <!-- implicit parameter of type 'GridVertex*' -->
           <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8280,11 +8280,11 @@ 
           <!-- implicit parameter of type 'GridVertex*' -->
           <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8293,7 +8293,7 @@ 
           <!-- implicit parameter of type 'GridVertex*' -->
           <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8302,7 +8302,7 @@ 
           <!-- implicit parameter of type 'GridVertex*' -->
           <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8332,7 +8332,7 @@ 
           <!-- implicit parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8341,11 +8341,11 @@ 
           <!-- implicit parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8358,7 +8358,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8369,7 +8369,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8378,7 +8378,7 @@ 
           <!-- implicit parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8387,7 +8387,7 @@ 
           <!-- implicit parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8396,7 +8396,7 @@ 
           <!-- implicit parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8405,7 +8405,7 @@ 
           <!-- implicit parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8414,7 +8414,7 @@ 
     <!-- BasicCurveEvaluator& -->
     <qualified-type-def type-id='type-id-80' id='type-id-189'/>
     <!-- BasicCurveEvaluator& -->
-    <reference-type-def kind='lvalue' type-id='type-id-7' size-in-bits='64' id='type-id-80'/>
+    <reference-type-def kind='lvalue' type-id='type-id-13' size-in-bits='64' id='type-id-80'/>
     <!-- BasicSurfaceEvaluator& -->
     <qualified-type-def type-id='type-id-81' id='type-id-190'/>
     <!-- BasicSurfaceEvaluator& -->
@@ -8449,11 +8449,11 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8480,7 +8480,7 @@ 
           <!-- implicit parameter of type 'Jarcloc*' -->
           <parameter type-id='type-id-205' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8492,15 +8492,15 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- long int Trimline::numverts -->
-        <var-decl name='numverts' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/trimline.h' line='49' column='1'/>
+        <var-decl name='numverts' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimline.h' line='49' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- long int Trimline::i -->
-        <var-decl name='i' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/trimline.h' line='50' column='1'/>
+        <var-decl name='i' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimline.h' line='50' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- long int Trimline::size -->
-        <var-decl name='size' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/trimline.h' line='51' column='1'/>
+        <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimline.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- Jarcloc Trimline::jarcl -->
@@ -8528,7 +8528,7 @@ 
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8537,9 +8537,9 @@ 
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8548,7 +8548,7 @@ 
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8559,7 +8559,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -8574,7 +8574,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -8583,7 +8583,7 @@ 
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -8592,9 +8592,9 @@ 
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8605,7 +8605,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8614,13 +8614,13 @@ 
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8629,7 +8629,7 @@ 
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8638,7 +8638,7 @@ 
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8651,7 +8651,7 @@ 
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8664,7 +8664,7 @@ 
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8675,7 +8675,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8686,7 +8686,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8730,15 +8730,15 @@ 
     <class-decl name='Uarray' size-in-bits='192' visibility='default' filepath='libnurbs/internals/uarray.h' line='44' column='1' id='type-id-208'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- long int Uarray::size -->
-        <var-decl name='size' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/uarray.h' line='46' column='1'/>
+        <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/uarray.h' line='46' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- long int Uarray::ulines -->
-        <var-decl name='ulines' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/uarray.h' line='47' column='1'/>
+        <var-decl name='ulines' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/uarray.h' line='47' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- REAL* Uarray::uarray -->
-        <var-decl name='uarray' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/uarray.h' line='52' column='1'/>
+        <var-decl name='uarray' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/uarray.h' line='52' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Uarray::Uarray() -->
@@ -8746,7 +8746,7 @@ 
           <!-- implicit parameter of type 'Uarray*' -->
           <parameter type-id='type-id-209' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -8755,9 +8755,9 @@ 
           <!-- implicit parameter of type 'Uarray*' -->
           <parameter type-id='type-id-209' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8772,7 +8772,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8808,7 +8808,7 @@ 
           <!-- implicit parameter of type 'TrimRegion*' -->
           <parameter type-id='type-id-212' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8819,7 +8819,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8834,7 +8834,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8845,7 +8845,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8854,11 +8854,11 @@ 
           <!-- implicit parameter of type 'TrimRegion*' -->
           <parameter type-id='type-id-212' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8869,7 +8869,7 @@ 
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8880,7 +8880,7 @@ 
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8893,7 +8893,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8902,7 +8902,7 @@ 
           <!-- implicit parameter of type 'TrimRegion*' -->
           <parameter type-id='type-id-212' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8911,7 +8911,7 @@ 
           <!-- implicit parameter of type 'TrimRegion*' -->
           <parameter type-id='type-id-212' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8919,7 +8919,7 @@ 
     <class-decl name='Gridline' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridline.h' line='39' column='1' id='type-id-211'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int Gridline::v -->
-        <var-decl name='v' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/gridline.h' line='40' column='1'/>
+        <var-decl name='v' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- REAL Gridline::vval -->
@@ -8927,15 +8927,15 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- long int Gridline::vindex -->
-        <var-decl name='vindex' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/gridline.h' line='42' column='1'/>
+        <var-decl name='vindex' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- long int Gridline::ustart -->
-        <var-decl name='ustart' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/gridline.h' line='43' column='1'/>
+        <var-decl name='ustart' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- long int Gridline::uend -->
-        <var-decl name='uend' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/gridline.h' line='44' column='1'/>
+        <var-decl name='uend' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='44' column='1'/>
       </data-member>
     </class-decl>
     <!-- class CoveAndTiler -->
@@ -8956,13 +8956,13 @@ 
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -8971,11 +8971,11 @@ 
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8984,7 +8984,7 @@ 
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8993,13 +8993,13 @@ 
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9008,7 +9008,7 @@ 
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9017,7 +9017,7 @@ 
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9026,7 +9026,7 @@ 
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9035,7 +9035,7 @@ 
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9046,7 +9046,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9057,7 +9057,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9068,7 +9068,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9079,7 +9079,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9088,7 +9088,7 @@ 
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9097,7 +9097,7 @@ 
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9106,7 +9106,7 @@ 
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9115,7 +9115,7 @@ 
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9126,7 +9126,7 @@ 
           <!-- parameter of type 'GridTrimVertex&' -->
           <parameter type-id='type-id-214'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9137,7 +9137,7 @@ 
           <!-- parameter of type 'GridVertex&' -->
           <parameter type-id='type-id-215'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9148,7 +9148,7 @@ 
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -9191,12 +9191,12 @@ 
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
     </array-type-def>
     <!-- float[4] -->
-    <array-type-def dimensions='1' type-id='type-id-30' size-in-bits='128' id='type-id-222'>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='128' id='type-id-222'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
     </array-type-def>
     <!-- int[2] -->
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-223'>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='64' id='type-id-223'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
     </array-type-def>
@@ -9212,19 +9212,19 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Curve::stride -->
-        <var-decl name='stride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='54' column='1'/>
+        <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curve.h' line='54' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- int Curve::order -->
-        <var-decl name='order' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curve.h' line='55' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- int Curve::cullval -->
-        <var-decl name='cullval' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='56' column='1'/>
+        <var-decl name='cullval' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curve.h' line='56' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <!-- int Curve::needsSampling -->
-        <var-decl name='needsSampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='57' column='1'/>
+        <var-decl name='needsSampling' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curve.h' line='57' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- REAL Curve::cpts[120] -->
@@ -9260,7 +9260,7 @@ 
           <!-- parameter of type 'Curve*' -->
           <parameter type-id='type-id-136'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -9275,7 +9275,7 @@ 
           <!-- parameter of type 'Curve*' -->
           <parameter type-id='type-id-136'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9284,7 +9284,7 @@ 
           <!-- implicit parameter of type 'Curve*' -->
           <parameter type-id='type-id-136' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9295,7 +9295,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9304,7 +9304,7 @@ 
           <!-- implicit parameter of type 'Curve*' -->
           <parameter type-id='type-id-136' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9313,7 +9313,7 @@ 
           <!-- implicit parameter of type 'Curve*' -->
           <parameter type-id='type-id-136' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9322,7 +9322,7 @@ 
           <!-- implicit parameter of type 'Curve*' -->
           <parameter type-id='type-id-136' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -9370,27 +9370,27 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
         <!-- long int Mapdesc::type -->
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='115' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
         <!-- int Mapdesc::isrational -->
-        <var-decl name='isrational' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='116' column='1'/>
+        <var-decl name='isrational' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='116' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='544'>
         <!-- int Mapdesc::ncoords -->
-        <var-decl name='ncoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='117' column='1'/>
+        <var-decl name='ncoords' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='117' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
         <!-- int Mapdesc::hcoords -->
-        <var-decl name='hcoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='118' column='1'/>
+        <var-decl name='hcoords' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='118' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='608'>
         <!-- int Mapdesc::inhcoords -->
-        <var-decl name='inhcoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='119' column='1'/>
+        <var-decl name='inhcoords' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='119' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
         <!-- int Mapdesc::mask -->
-        <var-decl name='mask' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='120' column='1'/>
+        <var-decl name='mask' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='672'>
         <!-- Maxmatrix Mapdesc::bmat -->
@@ -9438,15 +9438,15 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9455,9 +9455,9 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9466,7 +9466,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- typedef REAL -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -9477,11 +9477,11 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9490,7 +9490,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9499,7 +9499,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9508,7 +9508,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9517,7 +9517,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9526,7 +9526,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9535,7 +9535,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9544,7 +9544,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9553,7 +9553,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9562,7 +9562,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9571,7 +9571,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9580,7 +9580,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9589,7 +9589,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9598,17 +9598,17 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9617,13 +9617,13 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9632,17 +9632,17 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9651,17 +9651,17 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9670,17 +9670,17 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9691,17 +9691,17 @@ 
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9710,13 +9710,13 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- typedef REAL -->
@@ -9729,17 +9729,17 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9748,11 +9748,11 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- typedef REAL -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -9763,11 +9763,11 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- typedef REAL -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -9778,21 +9778,21 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9801,17 +9801,17 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9820,23 +9820,23 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9845,23 +9845,23 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9870,23 +9870,23 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9897,23 +9897,23 @@ 
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9922,27 +9922,27 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- typedef REAL -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -9953,23 +9953,23 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9980,7 +9980,7 @@ 
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9989,19 +9989,19 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10010,17 +10010,17 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10031,7 +10031,7 @@ 
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10042,7 +10042,7 @@ 
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10053,11 +10053,11 @@ 
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10068,11 +10068,11 @@ 
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10083,11 +10083,11 @@ 
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10096,7 +10096,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10105,7 +10105,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10116,17 +10116,17 @@ 
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10135,11 +10135,11 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- typedef REAL -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -10150,15 +10150,15 @@ 
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -10171,7 +10171,7 @@ 
           <!-- parameter of type 'float[4]*' -->
           <parameter type-id='type-id-229'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -10184,7 +10184,7 @@ 
           <!-- parameter of type 'float[4]*' -->
           <parameter type-id='type-id-229'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10193,11 +10193,11 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10206,17 +10206,17 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10225,11 +10225,11 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10238,11 +10238,11 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10253,11 +10253,11 @@ 
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10268,11 +10268,11 @@ 
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10281,7 +10281,7 @@ 
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- unsigned int -->
           <return type-id='type-id-230'/>
         </function-decl>
@@ -10291,15 +10291,15 @@ 
     <class-decl name='Knotvector' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/knotvector.h' line='41' column='1' id='type-id-231'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int Knotvector::order -->
-        <var-decl name='order' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/knotvector.h' line='48' column='1'/>
+        <var-decl name='order' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/knotvector.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int Knotvector::knotcount -->
-        <var-decl name='knotcount' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/knotvector.h' line='49' column='1'/>
+        <var-decl name='knotcount' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/knotvector.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- long int Knotvector::stride -->
-        <var-decl name='stride' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/knotvector.h' line='50' column='1'/>
+        <var-decl name='stride' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/knotvector.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- Knot* Knotvector::knotlist -->
@@ -10311,7 +10311,7 @@ 
           <!-- implicit parameter of type 'Knotvector*' -->
           <parameter type-id='type-id-82' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
@@ -10320,9 +10320,9 @@ 
           <!-- implicit parameter of type 'Knotvector*' -->
           <parameter type-id='type-id-82' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10331,15 +10331,15 @@ 
           <!-- implicit parameter of type 'Knotvector*' -->
           <parameter type-id='type-id-82' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10348,7 +10348,7 @@ 
           <!-- implicit parameter of type 'Knotvector*' -->
           <parameter type-id='type-id-82' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10359,7 +10359,7 @@ 
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-83'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -10367,23 +10367,23 @@ 
     <class-decl name='Quiltspec' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/quilt.h' line='51' column='1' id='type-id-216'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int Quiltspec::stride -->
-        <var-decl name='stride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='52' column='1'/>
+        <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- int Quiltspec::width -->
-        <var-decl name='width' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='53' column='1'/>
+        <var-decl name='width' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='53' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int Quiltspec::offset -->
-        <var-decl name='offset' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='54' column='1'/>
+        <var-decl name='offset' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- int Quiltspec::order -->
-        <var-decl name='order' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int Quiltspec::index -->
-        <var-decl name='index' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='56' column='1'/>
+        <var-decl name='index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int Quiltspec::bdry[2] -->
@@ -10423,7 +10423,7 @@ 
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curvelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- float[3] -->
-    <array-type-def dimensions='1' type-id='type-id-30' size-in-bits='96' id='type-id-137'>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='96' id='type-id-137'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
     </array-type-def>
@@ -10441,7 +10441,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void* Dlnode::arg -->
-        <var-decl name='arg' type-id='type-id-22' visibility='default' filepath='libnurbs/internals/displaylist.h' line='51' column='1'/>
+        <var-decl name='arg' type-id='type-id-25' visibility='default' filepath='libnurbs/internals/displaylist.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- PFVS Dlnode::cleanup -->
@@ -10459,11 +10459,11 @@ 
           <!-- parameter of type 'typedef PFVS' -->
           <parameter type-id='type-id-236'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- parameter of type 'typedef PFVS' -->
           <parameter type-id='type-id-236'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -10477,7 +10477,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int __delta -->
-        <var-decl name='__delta' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
+        <var-decl name='__delta' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
       </data-member>
     </class-decl>
     <!-- class DisplayList -->
@@ -10506,7 +10506,7 @@ 
           <!-- parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -10515,9 +10515,9 @@ 
           <!-- implicit parameter of type 'DisplayList*' -->
           <parameter type-id='type-id-78' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10526,7 +10526,7 @@ 
           <!-- implicit parameter of type 'DisplayList*' -->
           <parameter type-id='type-id-78' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10537,11 +10537,11 @@ 
           <!-- parameter of type 'typedef PFVS' -->
           <parameter type-id='type-id-236'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- parameter of type 'typedef PFVS' -->
           <parameter type-id='type-id-236'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10550,7 +10550,7 @@ 
           <!-- implicit parameter of type 'DisplayList*' -->
           <parameter type-id='type-id-78' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -10569,9 +10569,9 @@ 
       <!-- implicit parameter of type 'NurbsTessellator*' -->
       <parameter type-id='type-id-79' is-artificial='yes'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/flist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
@@ -10600,7 +10600,7 @@ 
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <!-- long int Hull::Side::index -->
-            <var-decl name='index' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/hull.h' line='59' column='1'/>
+            <var-decl name='index' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/hull.h' line='59' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
@@ -10626,11 +10626,11 @@ 
           <!-- implicit parameter of type 'Hull*' -->
           <parameter type-id='type-id-246' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -10639,11 +10639,11 @@ 
           <!-- implicit parameter of type 'Hull*' -->
           <parameter type-id='type-id-246' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10652,7 +10652,7 @@ 
           <!-- implicit parameter of type 'Hull*' -->
           <parameter type-id='type-id-246' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10718,7 +10718,7 @@ 
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10727,13 +10727,13 @@ 
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10742,9 +10742,9 @@ 
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10753,9 +10753,9 @@ 
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10764,7 +10764,7 @@ 
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10773,7 +10773,7 @@ 
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- Mapdesc* -->
           <return type-id='type-id-163'/>
         </function-decl>
@@ -10784,7 +10784,7 @@ 
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- Mapdesc* -->
           <return type-id='type-id-163'/>
         </function-decl>
@@ -10795,13 +10795,13 @@ 
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10812,7 +10812,7 @@ 
           <!-- parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10821,7 +10821,7 @@ 
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -10868,11 +10868,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='5056'>
         <!-- int Mesher::itop -->
-        <var-decl name='itop' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mesher.h' line='62' column='1'/>
+        <var-decl name='itop' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='62' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5088'>
         <!-- int Mesher::lastedge -->
-        <var-decl name='lastedge' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mesher.h' line='63' column='1'/>
+        <var-decl name='lastedge' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='63' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Mesher::Mesher(int, void**, Backend&) -->
@@ -10880,13 +10880,13 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -10895,11 +10895,11 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10910,7 +10910,7 @@ 
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-230'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10919,7 +10919,7 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10928,7 +10928,7 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10937,7 +10937,7 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10946,7 +10946,7 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10955,9 +10955,9 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10966,9 +10966,9 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10977,7 +10977,7 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10988,7 +10988,7 @@ 
           <!-- parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10997,9 +10997,9 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11008,11 +11008,11 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11021,11 +11021,11 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11034,11 +11034,11 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11047,9 +11047,9 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11058,7 +11058,7 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11067,7 +11067,7 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11076,7 +11076,7 @@ 
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11087,7 +11087,7 @@ 
           <!-- parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11098,7 +11098,7 @@ 
           <!-- parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11107,7 +11107,7 @@ 
     <!-- Mesher* -->
     <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-252'/>
     <!-- const float -->
-    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-250'/>
+    <qualified-type-def type-id='type-id-33' const='yes' id='type-id-250'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- Real[2] -->
@@ -11116,9 +11116,9 @@ 
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
     </array-type-def>
     <!-- typedef float Real -->
-    <typedef-decl name='Real' type-id='type-id-30' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-253'/>
+    <typedef-decl name='Real' type-id='type-id-33' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-253'/>
     <!-- typedef int Int -->
-    <typedef-decl name='Int' type-id='type-id-10' filepath='libnurbs/nurbtess/definitions.h' line='37' column='1' id='type-id-255'/>
+    <typedef-decl name='Int' type-id='type-id-11' filepath='libnurbs/nurbtess/definitions.h' line='37' column='1' id='type-id-255'/>
     <!-- class vertexArray -->
     <class-decl name='vertexArray' size-in-bits='128' visibility='default' filepath='libnurbs/nurbtess/monoTriangulation.h' line='77' column='1' id='type-id-256'>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -11141,7 +11141,7 @@ 
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -11154,7 +11154,7 @@ 
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -11163,9 +11163,9 @@ 
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-258' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11176,7 +11176,7 @@ 
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11313,7 +11313,7 @@ 
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-258' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11345,7 +11345,7 @@ 
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -11354,9 +11354,9 @@ 
           <!-- implicit parameter of type 'reflexChain*' -->
           <parameter type-id='type-id-263' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11369,7 +11369,7 @@ 
           <!-- parameter of type 'typedef Real' -->
           <parameter type-id='type-id-253'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11380,7 +11380,7 @@ 
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11393,7 +11393,7 @@ 
           <!-- parameter of type 'primStream*' -->
           <parameter type-id='type-id-186'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11406,7 +11406,7 @@ 
           <!-- parameter of type 'primStream*' -->
           <parameter type-id='type-id-186'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11419,7 +11419,7 @@ 
           <!-- parameter of type 'Backend*' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11432,7 +11432,7 @@ 
           <!-- parameter of type 'Backend*' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11441,7 +11441,7 @@ 
           <!-- implicit parameter of type 'reflexChain*' -->
           <parameter type-id='type-id-263' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11491,7 +11491,7 @@ 
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -11500,9 +11500,9 @@ 
           <!-- implicit parameter of type 'primStream*' -->
           <parameter type-id='type-id-186' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11551,7 +11551,7 @@ 
           <!-- implicit parameter of type 'primStream*' -->
           <parameter type-id='type-id-186' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11564,7 +11564,7 @@ 
           <!-- parameter of type 'typedef Real' -->
           <parameter type-id='type-id-253'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11575,7 +11575,7 @@ 
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11586,7 +11586,7 @@ 
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11610,7 +11610,7 @@ 
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11619,7 +11619,7 @@ 
           <!-- implicit parameter of type 'primStream*' -->
           <parameter type-id='type-id-186' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11628,7 +11628,7 @@ 
           <!-- implicit parameter of type 'primStream*' -->
           <parameter type-id='type-id-186' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11662,7 +11662,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int O_pwlcurve::npts -->
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='86' column='1'/>
+        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='86' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- O_pwlcurve* O_pwlcurve::next -->
@@ -11670,11 +11670,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int O_pwlcurve::used -->
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='88' column='1'/>
+        <var-decl name='used' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- int O_pwlcurve::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='89' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- O_curve* O_pwlcurve::owner -->
@@ -11686,17 +11686,17 @@ 
           <!-- implicit parameter of type 'O_pwlcurve*' -->
           <parameter type-id='type-id-84' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11706,11 +11706,11 @@ 
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-111'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int Property::type -->
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='121' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='121' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int Property::tag -->
-        <var-decl name='tag' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='122' column='1'/>
+        <var-decl name='tag' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='122' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- REAL Property::value -->
@@ -11718,7 +11718,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int Property::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='124' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='124' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Property::Property(long int, long int, float) -->
@@ -11726,13 +11726,13 @@ 
           <!-- implicit parameter of type 'Property*' -->
           <parameter type-id='type-id-87' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float' -->
-          <parameter type-id='type-id-30'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -11741,11 +11741,11 @@ 
           <!-- implicit parameter of type 'Property*' -->
           <parameter type-id='type-id-87' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float' -->
-          <parameter type-id='type-id-30'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11759,7 +11759,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int O_nurbssurface::type -->
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='103' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- O_surface* O_nurbssurface::owner -->
@@ -11771,11 +11771,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int O_nurbssurface::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='106' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int O_nurbssurface::used -->
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='107' column='1'/>
+        <var-decl name='used' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='107' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- O_nurbssurface::O_nurbssurface(long int) -->
@@ -11783,9 +11783,9 @@ 
           <!-- implicit parameter of type 'O_nurbssurface*' -->
           <parameter type-id='type-id-86' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11803,11 +11803,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int O_surface::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='115' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='115' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- long int O_surface::nuid -->
-        <var-decl name='nuid' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='116' column='1'/>
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='116' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- O_surface::O_surface() -->
@@ -11815,7 +11815,7 @@ 
           <!-- implicit parameter of type 'O_surface*' -->
           <parameter type-id='type-id-75' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11833,7 +11833,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int O_trim::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='97' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='97' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- O_trim::O_trim() -->
@@ -11841,7 +11841,7 @@ 
           <!-- implicit parameter of type 'O_trim*' -->
           <parameter type-id='type-id-76' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11880,15 +11880,15 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int O_curve::used -->
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='63' column='1'/>
+        <var-decl name='used' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int O_curve::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='64' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- long int O_curve::nuid -->
-        <var-decl name='nuid' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='65' column='1'/>
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='65' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- O_curve::O_curve() -->
@@ -11896,7 +11896,7 @@ 
           <!-- implicit parameter of type 'O_curve*' -->
           <parameter type-id='type-id-77' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11910,7 +11910,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int O_nurbscurve::type -->
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='72' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- REAL O_nurbscurve::tesselation -->
@@ -11918,7 +11918,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int O_nurbscurve::method -->
-        <var-decl name='method' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='74' column='1'/>
+        <var-decl name='method' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- O_nurbscurve* O_nurbscurve::next -->
@@ -11926,11 +11926,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int O_nurbscurve::used -->
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='76' column='1'/>
+        <var-decl name='used' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='76' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int O_nurbscurve::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='77' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- O_curve* O_nurbscurve::owner -->
@@ -11942,15 +11942,15 @@ 
           <!-- implicit parameter of type 'O_nurbscurve*' -->
           <parameter type-id='type-id-85' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- enum Curvetype -->
     <enum-decl name='Curvetype' filepath='libnurbs/internals/reader.h' line='42' column='1' id='type-id-274'>
-      <underlying-type type-id='type-id-38'/>
+      <underlying-type type-id='type-id-9'/>
       <enumerator name='ct_nurbscurve' value='0'/>
       <enumerator name='ct_pwlcurve' value='1'/>
       <enumerator name='ct_none' value='2'/>
@@ -12020,7 +12020,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- int Pspec::needsSubdivision -->
-        <var-decl name='needsSubdivision' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='51' column='1'/>
+        <var-decl name='needsSubdivision' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='51' column='1'/>
       </data-member>
     </class-decl>
     <!-- class Patch -->
@@ -12035,15 +12035,15 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Patch::cullval -->
-        <var-decl name='cullval' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='84' column='1'/>
+        <var-decl name='cullval' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='84' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- int Patch::notInBbox -->
-        <var-decl name='notInBbox' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='85' column='1'/>
+        <var-decl name='notInBbox' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='85' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- int Patch::needsSampling -->
-        <var-decl name='needsSampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='86' column='1'/>
+        <var-decl name='needsSampling' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='86' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <!-- REAL Patch::cpts[2880] -->
@@ -12073,13 +12073,13 @@ 
           <!-- parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'Patch*' -->
           <parameter type-id='type-id-179'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -12090,13 +12090,13 @@ 
           <!-- parameter of type 'Patch&' -->
           <parameter type-id='type-id-283'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'Patch*' -->
           <parameter type-id='type-id-179'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12105,7 +12105,7 @@ 
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12114,7 +12114,7 @@ 
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12123,7 +12123,7 @@ 
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12132,7 +12132,7 @@ 
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12141,9 +12141,9 @@ 
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12152,7 +12152,7 @@ 
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12161,7 +12161,7 @@ 
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12170,7 +12170,7 @@ 
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12179,7 +12179,7 @@ 
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12188,7 +12188,7 @@ 
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -12198,11 +12198,11 @@ 
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-281'/>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int Patchspec::order -->
-        <var-decl name='order' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int Patchspec::stride -->
-        <var-decl name='stride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='56' column='1'/>
+        <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='56' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- void Patchspec::clamp(REAL) -->
@@ -12212,7 +12212,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -12223,7 +12223,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -12232,7 +12232,7 @@ 
           <!-- implicit parameter of type 'Patchspec*' -->
           <parameter type-id='type-id-284' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -12287,7 +12287,7 @@ 
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -12296,9 +12296,9 @@ 
           <!-- implicit parameter of type 'rectBlock*' -->
           <parameter type-id='type-id-286' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12352,7 +12352,7 @@ 
           <!-- implicit parameter of type 'rectBlock*' -->
           <parameter type-id='type-id-286' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12365,7 +12365,7 @@ 
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -12425,7 +12425,7 @@ 
           <!-- parameter of type 'typedef Real' -->
           <parameter type-id='type-id-253'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -12442,7 +12442,7 @@ 
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -12451,9 +12451,9 @@ 
           <!-- implicit parameter of type 'gridWrap*' -->
           <parameter type-id='type-id-188' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12462,7 +12462,7 @@ 
           <!-- implicit parameter of type 'gridWrap*' -->
           <parameter type-id='type-id-188' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12575,7 +12575,7 @@ 
           <!-- parameter of type 'primStream*' -->
           <parameter type-id='type-id-186'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12584,7 +12584,7 @@ 
           <!-- implicit parameter of type 'gridWrap*' -->
           <parameter type-id='type-id-188' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12619,7 +12619,7 @@ 
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -12628,9 +12628,9 @@ 
           <!-- implicit parameter of type 'rectBlockArray*' -->
           <parameter type-id='type-id-187' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12661,7 +12661,7 @@ 
           <!-- parameter of type 'rectBlock*' -->
           <parameter type-id='type-id-286'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12679,7 +12679,7 @@ 
           <!-- implicit parameter of type 'rectBlockArray*' -->
           <parameter type-id='type-id-187' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12692,7 +12692,7 @@ 
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -12738,7 +12738,7 @@ 
           <!-- parameter of type 'Int*' -->
           <parameter type-id='type-id-266'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -12747,9 +12747,9 @@ 
           <!-- implicit parameter of type 'gridBoundaryChain*' -->
           <parameter type-id='type-id-287' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12857,7 +12857,7 @@ 
           <!-- parameter of type 'primStream*' -->
           <parameter type-id='type-id-186'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12870,7 +12870,7 @@ 
           <!-- parameter of type 'primStream*' -->
           <parameter type-id='type-id-186'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12894,7 +12894,7 @@ 
           <!-- implicit parameter of type 'gridBoundaryChain*' -->
           <parameter type-id='type-id-287' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12903,7 +12903,7 @@ 
           <!-- implicit parameter of type 'gridBoundaryChain*' -->
           <parameter type-id='type-id-287' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -12925,7 +12925,7 @@ 
     <class-decl name='Knotspec' size-in-bits='1152' is-struct='yes' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='54' column='1' id='type-id-292'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int Knotspec::order -->
-        <var-decl name='order' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- Knot_ptr Knotspec::inkbegin -->
@@ -12973,35 +12973,35 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- int Knotspec::ncoords -->
-        <var-decl name='ncoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='67' column='1'/>
+        <var-decl name='ncoords' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
         <!-- int Knotspec::prestride -->
-        <var-decl name='prestride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='68' column='1'/>
+        <var-decl name='prestride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- int Knotspec::poststride -->
-        <var-decl name='poststride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='69' column='1'/>
+        <var-decl name='poststride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='864'>
         <!-- int Knotspec::preoffset -->
-        <var-decl name='preoffset' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='70' column='1'/>
+        <var-decl name='preoffset' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- int Knotspec::postoffset -->
-        <var-decl name='postoffset' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='71' column='1'/>
+        <var-decl name='postoffset' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
         <!-- int Knotspec::prewidth -->
-        <var-decl name='prewidth' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='72' column='1'/>
+        <var-decl name='prewidth' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- int Knotspec::postwidth -->
-        <var-decl name='postwidth' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='73' column='1'/>
+        <var-decl name='postwidth' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='992'>
         <!-- int Knotspec::istransformed -->
-        <var-decl name='istransformed' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='74' column='1'/>
+        <var-decl name='istransformed' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- Knotspec* Knotspec::next -->
@@ -13017,7 +13017,7 @@ 
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
@@ -13026,9 +13026,9 @@ 
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13037,7 +13037,7 @@ 
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13046,9 +13046,9 @@ 
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13057,7 +13057,7 @@ 
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13066,7 +13066,7 @@ 
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13077,9 +13077,9 @@ 
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13088,7 +13088,7 @@ 
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13097,7 +13097,7 @@ 
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13106,9 +13106,9 @@ 
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13117,9 +13117,9 @@ 
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13128,11 +13128,11 @@ 
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13141,11 +13141,11 @@ 
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13154,22 +13154,22 @@ 
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'typedef Knot' -->
           <parameter type-id='type-id-233'/>
           <!-- parameter of type 'typedef Knot' -->
           <parameter type-id='type-id-233'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- typedef REAL* Knot_ptr -->
-    <typedef-decl name='Knot_ptr' type-id='type-id-13' filepath='libnurbs/internals/types.h' line='45' column='1' id='type-id-293'/>
+    <typedef-decl name='Knot_ptr' type-id='type-id-16' filepath='libnurbs/internals/types.h' line='45' column='1' id='type-id-293'/>
     <!-- struct Breakpt -->
     <class-decl name='Breakpt' size-in-bits='96' is-struct='yes' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='48' column='1' id='type-id-296'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -13178,11 +13178,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- int Breakpt::multi -->
-        <var-decl name='multi' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='50' column='1'/>
+        <var-decl name='multi' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int Breakpt::def -->
-        <var-decl name='def' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='51' column='1'/>
+        <var-decl name='def' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='51' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct Splinespec -->
@@ -13193,11 +13193,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int Splinespec::dim -->
-        <var-decl name='dim' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='99' column='1'/>
+        <var-decl name='dim' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- REAL* Splinespec::outcpts -->
-        <var-decl name='outcpts' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='100' column='1'/>
+        <var-decl name='outcpts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='100' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Splinespec::Splinespec(int) -->
@@ -13205,9 +13205,9 @@ 
           <!-- implicit parameter of type 'Splinespec*' -->
           <parameter type-id='type-id-298' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
@@ -13216,9 +13216,9 @@ 
           <!-- implicit parameter of type 'Splinespec*' -->
           <parameter type-id='type-id-298' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13229,7 +13229,7 @@ 
           <!-- parameter of type 'Knotvector&' -->
           <parameter type-id='type-id-166'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13242,7 +13242,7 @@ 
           <!-- parameter of type 'Knotvector&' -->
           <parameter type-id='type-id-166'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13251,7 +13251,7 @@ 
           <!-- implicit parameter of type 'Splinespec*' -->
           <parameter type-id='type-id-298' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13260,9 +13260,9 @@ 
           <!-- implicit parameter of type 'Splinespec*' -->
           <parameter type-id='type-id-298' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13273,7 +13273,7 @@ 
           <!-- parameter of type 'typedef Quilt_ptr' -->
           <parameter type-id='type-id-299'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13284,7 +13284,7 @@ 
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13293,7 +13293,7 @@ 
           <!-- implicit parameter of type 'Splinespec*' -->
           <parameter type-id='type-id-298' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -13313,7 +13313,7 @@ 
       <subrange length='1000' type-id='type-id-3' id='type-id-301'/>
     </array-type-def>
     <!-- long int[1000] -->
-    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='64000' id='type-id-302'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='64000' id='type-id-302'>
       <!-- <anonymous range>[1000] -->
       <subrange length='1000' type-id='type-id-3' id='type-id-301'/>
     </array-type-def>
@@ -13321,7 +13321,7 @@ 
     <class-decl name='Varray' size-in-bits='96192' visibility='default' filepath='libnurbs/internals/varray.h' line='43' column='1' id='type-id-303'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- REAL* Varray::varray -->
-        <var-decl name='varray' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/varray.h' line='48' column='1'/>
+        <var-decl name='varray' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/varray.h' line='48' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- REAL Varray::vval[1000] -->
@@ -13333,11 +13333,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='96064'>
         <!-- long int Varray::numquads -->
-        <var-decl name='numquads' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/varray.h' line='51' column='1'/>
+        <var-decl name='numquads' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/varray.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96128'>
         <!-- long int Varray::size -->
-        <var-decl name='size' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/varray.h' line='54' column='1'/>
+        <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/varray.h' line='54' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Varray::Varray() -->
@@ -13345,7 +13345,7 @@ 
           <!-- implicit parameter of type 'Varray*' -->
           <parameter type-id='type-id-304' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -13354,9 +13354,9 @@ 
           <!-- implicit parameter of type 'Varray*' -->
           <parameter type-id='type-id-304' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13371,7 +13371,7 @@ 
           <!-- parameter of type 'Arc*' -->
           <parameter type-id='type-id-116'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13386,7 +13386,7 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13395,9 +13395,9 @@ 
           <!-- implicit parameter of type 'Varray*' -->
           <parameter type-id='type-id-304' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13408,14 +13408,14 @@ 
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- Varray* -->
     <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-304'/>
     <!-- long int* -->
-    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-305'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/directedLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- short int -->
@@ -13442,7 +13442,7 @@ 
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -13455,7 +13455,7 @@ 
           <!-- parameter of type 'Real[2]*' -->
           <parameter type-id='type-id-259'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -13468,7 +13468,7 @@ 
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -13477,7 +13477,7 @@ 
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -13486,9 +13486,9 @@ 
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13501,7 +13501,7 @@ 
           <!-- parameter of type 'Real2*' -->
           <parameter type-id='type-id-262'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13514,7 +13514,7 @@ 
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13534,7 +13534,7 @@ 
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13565,7 +13565,7 @@ 
           <!-- parameter of type 'typedef Real' -->
           <parameter type-id='type-id-253'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13578,7 +13578,7 @@ 
           <!-- parameter of type 'typedef Real' -->
           <parameter type-id='type-id-253'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13587,7 +13587,7 @@ 
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -13631,7 +13631,7 @@ 
           <!-- parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-308'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -13640,7 +13640,7 @@ 
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -13649,9 +13649,9 @@ 
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13664,7 +13664,7 @@ 
           <!-- parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-308'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13758,7 +13758,7 @@ 
           <!-- parameter of type 'short int' -->
           <parameter type-id='type-id-306'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13769,7 +13769,7 @@ 
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13780,7 +13780,7 @@ 
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13791,7 +13791,7 @@ 
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13800,7 +13800,7 @@ 
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13809,7 +13809,7 @@ 
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13818,7 +13818,7 @@ 
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13827,7 +13827,7 @@ 
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13838,7 +13838,7 @@ 
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13961,7 +13961,7 @@ 
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13970,7 +13970,7 @@ 
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13979,7 +13979,7 @@ 
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13990,7 +13990,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14057,7 +14057,7 @@ 
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14076,7 +14076,7 @@ 
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14098,7 +14098,7 @@ 
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14107,7 +14107,7 @@ 
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14127,7 +14127,7 @@ 
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14160,7 +14160,7 @@ 
     <!-- directedLine** -->
     <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-312'/>
     <!-- int& -->
-    <reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-311'/>
+    <reference-type-def kind='lvalue' type-id='type-id-11' size-in-bits='64' id='type-id-311'/>
     <!-- sampledLine* -->
     <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-308'/>
     <!-- sampledLine** -->
@@ -14231,7 +14231,7 @@ 
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -14240,9 +14240,9 @@ 
           <!-- implicit parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14253,7 +14253,7 @@ 
           <!-- parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14264,7 +14264,7 @@ 
           <!-- parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14275,7 +14275,7 @@ 
           <!-- parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14320,7 +14320,7 @@ 
           <!-- implicit parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14329,7 +14329,7 @@ 
           <!-- implicit parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14338,7 +14338,7 @@ 
           <!-- implicit parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14349,7 +14349,7 @@ 
           <!-- parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14422,7 +14422,7 @@ 
           <!-- implicit parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14431,7 +14431,7 @@ 
           <!-- implicit parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14440,7 +14440,7 @@ 
           <!-- implicit parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -14482,16 +14482,16 @@ 
       <subrange length='1' type-id='type-id-3' id='type-id-325'/>
     </array-type-def>
     <!-- float -->
-    <type-decl name='float' size-in-bits='32' id='type-id-30'/>
+    <type-decl name='float' size-in-bits='32' id='type-id-33'/>
     <!-- long int -->
-    <type-decl name='long int' size-in-bits='64' id='type-id-12'/>
+    <type-decl name='long int' size-in-bits='64' id='type-id-15'/>
     <!-- long int[8] -->
-    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='512' id='type-id-326'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='512' id='type-id-326'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-3' id='type-id-327'/>
     </array-type-def>
     <!-- unnamed&#45;enum&#45;underlying&#45;type -->
-    <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-38'/>
+    <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-9'/>
     <!-- unsigned long int -->
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-3'/>
     <!-- unsigned long int[16] -->
@@ -14517,7 +14517,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void (typedef GLenum)* GLUtesselator::callError -->
-        <var-decl name='callError' type-id='type-id-16' visibility='default' filepath='libtess/tess.h' line='69' column='1'/>
+        <var-decl name='callError' type-id='type-id-19' visibility='default' filepath='libtess/tess.h' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- GLdouble GLUtesselator::normal[3] -->
@@ -14537,7 +14537,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- GLenum GLUtesselator::windingRule -->
-        <var-decl name='windingRule' type-id='type-id-25' visibility='default' filepath='libtess/tess.h' line='80' column='1'/>
+        <var-decl name='windingRule' type-id='type-id-28' visibility='default' filepath='libtess/tess.h' line='80' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
         <!-- GLboolean GLUtesselator::fatalError -->
@@ -14573,7 +14573,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <!-- void (typedef GLenum)* GLUtesselator::callBegin -->
-        <var-decl name='callBegin' type-id='type-id-16' visibility='default' filepath='libtess/tess.h' line='97' column='1'/>
+        <var-decl name='callBegin' type-id='type-id-19' visibility='default' filepath='libtess/tess.h' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- void (typedef GLboolean)* GLUtesselator::callEdgeFlag -->
@@ -14581,11 +14581,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <!-- void (void*)* GLUtesselator::callVertex -->
-        <var-decl name='callVertex' type-id='type-id-20' visibility='default' filepath='libtess/tess.h' line='99' column='1'/>
+        <var-decl name='callVertex' type-id='type-id-23' visibility='default' filepath='libtess/tess.h' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- void ()* GLUtesselator::callEnd -->
-        <var-decl name='callEnd' type-id='type-id-17' visibility='default' filepath='libtess/tess.h' line='100' column='1'/>
+        <var-decl name='callEnd' type-id='type-id-20' visibility='default' filepath='libtess/tess.h' line='100' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
         <!-- void (GLUmesh*)* GLUtesselator::callMesh -->
@@ -14597,7 +14597,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='1696'>
         <!-- int GLUtesselator::cacheCount -->
-        <var-decl name='cacheCount' type-id='type-id-10' visibility='default' filepath='libtess/tess.h' line='107' column='1'/>
+        <var-decl name='cacheCount' type-id='type-id-11' visibility='default' filepath='libtess/tess.h' line='107' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
         <!-- CachedVertex GLUtesselator::cache[100] -->
@@ -14605,7 +14605,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='27328'>
         <!-- void (typedef GLenum, void*)* GLUtesselator::callBeginData -->
-        <var-decl name='callBeginData' type-id='type-id-19' visibility='default' filepath='libtess/tess.h' line='111' column='1'/>
+        <var-decl name='callBeginData' type-id='type-id-22' visibility='default' filepath='libtess/tess.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27392'>
         <!-- void (typedef GLboolean, void*)* GLUtesselator::callEdgeFlagData -->
@@ -14617,11 +14617,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='27520'>
         <!-- void (void*)* GLUtesselator::callEndData -->
-        <var-decl name='callEndData' type-id='type-id-20' visibility='default' filepath='libtess/tess.h' line='115' column='1'/>
+        <var-decl name='callEndData' type-id='type-id-23' visibility='default' filepath='libtess/tess.h' line='115' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27584'>
         <!-- void (typedef GLenum, void*)* GLUtesselator::callErrorData -->
-        <var-decl name='callErrorData' type-id='type-id-19' visibility='default' filepath='libtess/tess.h' line='116' column='1'/>
+        <var-decl name='callErrorData' type-id='type-id-22' visibility='default' filepath='libtess/tess.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27648'>
         <!-- void (GLdouble*, void**, GLfloat*, void**, void*)* GLUtesselator::callCombineData -->
@@ -14633,12 +14633,12 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='29312'>
         <!-- void* GLUtesselator::polygonData -->
-        <var-decl name='polygonData' type-id='type-id-22' visibility='default' filepath='libtess/tess.h' line='123' column='1'/>
+        <var-decl name='polygonData' type-id='type-id-25' visibility='default' filepath='libtess/tess.h' line='123' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum TessState -->
     <enum-decl name='TessState' filepath='libtess/tess.h' line='47' column='1' id='type-id-332'>
-      <underlying-type type-id='type-id-38'/>
+      <underlying-type type-id='type-id-9'/>
       <enumerator name='T_DORMANT' value='0'/>
       <enumerator name='T_IN_POLYGON' value='1'/>
       <enumerator name='T_IN_CONTOUR' value='2'/>
@@ -14675,7 +14675,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- int GLUhalfEdge::winding -->
-        <var-decl name='winding' type-id='type-id-10' visibility='default' filepath='libtess/mesh.h' line='148' column='1'/>
+        <var-decl name='winding' type-id='type-id-11' visibility='default' filepath='libtess/mesh.h' line='148' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef GLUhalfEdge GLUhalfEdge -->
@@ -14696,7 +14696,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void* GLUvertex::data -->
-        <var-decl name='data' type-id='type-id-22' visibility='default' filepath='libtess/mesh.h' line='118' column='1'/>
+        <var-decl name='data' type-id='type-id-25' visibility='default' filepath='libtess/mesh.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- GLdouble GLUvertex::coords[3] -->
@@ -14712,7 +14712,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- long int GLUvertex::pqHandle -->
-        <var-decl name='pqHandle' type-id='type-id-12' visibility='default' filepath='libtess/mesh.h' line='123' column='1'/>
+        <var-decl name='pqHandle' type-id='type-id-15' visibility='default' filepath='libtess/mesh.h' line='123' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef GLUvertex GLUvertex -->
@@ -14733,7 +14733,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void* GLUface::data -->
-        <var-decl name='data' type-id='type-id-22' visibility='default' filepath='libtess/mesh.h' line='130' column='1'/>
+        <var-decl name='data' type-id='type-id-25' visibility='default' filepath='libtess/mesh.h' line='130' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- GLUface* GLUface::trail -->
@@ -14764,7 +14764,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int ActiveRegion::windingNumber -->
-        <var-decl name='windingNumber' type-id='type-id-10' visibility='default' filepath='libtess/sweep.h' line='62' column='1'/>
+        <var-decl name='windingNumber' type-id='type-id-11' visibility='default' filepath='libtess/sweep.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- GLboolean ActiveRegion::inside -->
@@ -14799,7 +14799,7 @@ 
       </data-member>
     </class-decl>
     <!-- typedef void* DictListKey -->
-    <typedef-decl name='DictListKey' type-id='type-id-22' filepath='libtess/dict.h' line='60' column='1' id='type-id-356'/>
+    <typedef-decl name='DictListKey' type-id='type-id-25' filepath='libtess/dict.h' line='60' column='1' id='type-id-356'/>
     <!-- typedef DictListNode DictListNode -->
     <typedef-decl name='DictListNode' type-id='type-id-355' filepath='libtess/dict.h' line='62' column='1' id='type-id-357'/>
     <!-- typedef GLUmesh GLUmesh -->
@@ -14831,7 +14831,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int __jmp_buf_tag::__mask_was_saved -->
-        <var-decl name='__mask_was_saved' type-id='type-id-10' visibility='default' filepath='/usr/include/setjmp.h' line='42' column='1'/>
+        <var-decl name='__mask_was_saved' type-id='type-id-11' visibility='default' filepath='/usr/include/setjmp.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- __sigset_t __jmp_buf_tag::__saved_mask -->
@@ -14848,7 +14848,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void* DictList::frame -->
-        <var-decl name='frame' type-id='type-id-22' visibility='default' filepath='libtess/dict.h' line='96' column='1'/>
+        <var-decl name='frame' type-id='type-id-25' visibility='default' filepath='libtess/dict.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int (void*, typedef DictListKey, typedef DictListKey)* DictList::leq -->
@@ -14881,7 +14881,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int PriorityQSort::initialized -->
-        <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='libtess/priorityq.h' line='102' column='1'/>
+        <var-decl name='initialized' type-id='type-id-11' visibility='default' filepath='libtess/priorityq.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- int (typedef PQSortKey, typedef PQSortKey)* PriorityQSort::leq -->
@@ -14902,11 +14902,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- long int PriorityQHeap::size -->
-        <var-decl name='size' type-id='type-id-12' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
+        <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- long int PriorityQHeap::max -->
-        <var-decl name='max' type-id='type-id-12' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
+        <var-decl name='max' type-id='type-id-15' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- PQHeapHandle PriorityQHeap::freeList -->
@@ -14914,7 +14914,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int PriorityQHeap::initialized -->
-        <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='libtess/priorityq-heap.h' line='91' column='1'/>
+        <var-decl name='initialized' type-id='type-id-11' visibility='default' filepath='libtess/priorityq-heap.h' line='91' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- int (typedef PQHeapKey, typedef PQHeapKey)* PriorityQHeap::leq -->
@@ -14931,7 +14931,7 @@ 
       </data-member>
     </class-decl>
     <!-- typedef long int PQHeapHandle -->
-    <typedef-decl name='PQHeapHandle' type-id='type-id-12' filepath='libtess/priorityq-heap.h' line='80' column='1' id='type-id-376'/>
+    <typedef-decl name='PQHeapHandle' type-id='type-id-15' filepath='libtess/priorityq-heap.h' line='80' column='1' id='type-id-376'/>
     <!-- typedef __anonymous_struct__1 PQhandleElem -->
     <typedef-decl name='PQhandleElem' type-id='type-id-380' filepath='libtess/priorityq-heap.h' line='84' column='1' id='type-id-381'/>
     <!-- struct {PQHeapKey key; PQHeapHandle node;} -->
@@ -14946,13 +14946,13 @@ 
       </data-member>
     </class-decl>
     <!-- typedef void* PQHeapKey -->
-    <typedef-decl name='PQHeapKey' type-id='type-id-22' filepath='libtess/priorityq-heap.h' line='79' column='1' id='type-id-382'/>
+    <typedef-decl name='PQHeapKey' type-id='type-id-25' filepath='libtess/priorityq-heap.h' line='79' column='1' id='type-id-382'/>
     <!-- typedef PQHeapKey PQSortKey -->
     <typedef-decl name='PQSortKey' type-id='type-id-382' filepath='libtess/priorityq.h' line='93' column='1' id='type-id-383'/>
     <!-- typedef PQHeapHandle PQSortHandle -->
     <typedef-decl name='PQSortHandle' type-id='type-id-376' filepath='libtess/priorityq.h' line='94' column='1' id='type-id-370'/>
     <!-- typedef float GLfloat -->
-    <typedef-decl name='GLfloat' type-id='type-id-30' filepath='../../../include/GL/gl.h' line='160' column='1' id='type-id-33'/>
+    <typedef-decl name='GLfloat' type-id='type-id-33' filepath='../../../include/GL/gl.h' line='160' column='1' id='type-id-35'/>
     <!-- typedef CachedVertex CachedVertex -->
     <typedef-decl name='CachedVertex' type-id='type-id-384' filepath='libtess/tess.h' line='57' column='1' id='type-id-318'/>
     <!-- struct CachedVertex -->
@@ -14963,7 +14963,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void* CachedVertex::data -->
-        <var-decl name='data' type-id='type-id-22' visibility='default' filepath='libtess/tess.h' line='56' column='1'/>
+        <var-decl name='data' type-id='type-id-25' visibility='default' filepath='libtess/tess.h' line='56' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef __jmp_buf_tag[1] jmp_buf -->
@@ -14996,7 +14996,7 @@ 
     <!-- GLUvertex* -->
     <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-337'/>
     <!-- GLfloat* -->
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-47'/>
+    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-47'/>
     <!-- PQSortKey* -->
     <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-368'/>
     <!-- PQSortKey** -->
@@ -15026,36 +15026,36 @@ 
     <!-- void (typedef GLboolean, void*)* -->
     <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-342'/>
     <!-- void (typedef GLenum)* -->
-    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-16'/>
+    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-19'/>
     <!-- void (typedef GLenum, void*)* -->
-    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-19'/>
+    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-22'/>
     <!-- void (void*)* -->
-    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-20'/>
+    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-23'/>
     <!-- void (void*, void*)* -->
     <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-343'/>
     <!-- void** -->
-    <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-185'/>
+    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-185'/>
     <!-- void gluTessProperty(GLUtesselator*, GLenum, GLdouble) -->
     <function-decl name='gluTessProperty' mangled-name='gluTessProperty' filepath='libtess/tess.c' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessProperty'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='201' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='which' filepath='libtess/tess.c' line='201' column='1'/>
+      <parameter type-id='type-id-28' name='which' filepath='libtess/tess.c' line='201' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
       <parameter type-id='type-id-321' name='value' filepath='libtess/tess.c' line='201' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluGetTessProperty(GLUtesselator*, GLenum, GLdouble*) -->
     <function-decl name='gluGetTessProperty' mangled-name='gluGetTessProperty' filepath='libtess/tess.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetTessProperty'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='240' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='which' filepath='libtess/tess.c' line='240' column='1'/>
+      <parameter type-id='type-id-28' name='which' filepath='libtess/tess.c' line='240' column='1'/>
       <!-- parameter of type 'GLdouble*' -->
       <parameter type-id='type-id-399' name='value' filepath='libtess/tess.c' line='240' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluTessNormal(GLUtesselator*, GLdouble, GLdouble, GLdouble) -->
     <function-decl name='gluTessNormal' mangled-name='gluTessNormal' filepath='libtess/tess.c' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessNormal'>
@@ -15068,71 +15068,71 @@ 
       <!-- parameter of type 'typedef GLdouble' -->
       <parameter type-id='type-id-321' name='z' filepath='libtess/tess.c' line='268' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluTessCallback(GLUtesselator*, GLenum, _GLUfuncptr) -->
     <function-decl name='gluTessCallback' mangled-name='gluTessCallback' filepath='libtess/tess.c' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessCallback'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='276' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='which' filepath='libtess/tess.c' line='276' column='1'/>
+      <parameter type-id='type-id-28' name='which' filepath='libtess/tess.c' line='276' column='1'/>
       <!-- parameter of type 'typedef _GLUfuncptr' -->
-      <parameter type-id='type-id-26' name='fn' filepath='libtess/tess.c' line='276' column='1'/>
+      <parameter type-id='type-id-29' name='fn' filepath='libtess/tess.c' line='276' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluTessEndContour(GLUtesselator*) -->
     <function-decl name='gluTessEndContour' mangled-name='gluTessEndContour' filepath='libtess/tess.c' line='493' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessEndContour'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='493' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluTessBeginContour(GLUtesselator*) -->
     <function-decl name='gluTessBeginContour' mangled-name='gluTessBeginContour' filepath='libtess/tess.c' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessBeginContour'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='476' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluNextContour(GLUtesselator*, GLenum) -->
     <function-decl name='gluNextContour' mangled-name='gluNextContour' filepath='libtess/tess.c' line='620' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNextContour'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='620' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libtess/tess.c' line='620' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libtess/tess.c' line='620' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluTessBeginPolygon(GLUtesselator*, void*) -->
     <function-decl name='gluTessBeginPolygon' mangled-name='gluTessBeginPolygon' filepath='libtess/tess.c' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessBeginPolygon'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='462' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libtess/tess.c' line='462' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libtess/tess.c' line='462' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluBeginPolygon(GLUtesselator*) -->
     <function-decl name='gluBeginPolygon' mangled-name='gluBeginPolygon' filepath='libtess/tess.c' line='611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginPolygon'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='611' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluTessEndPolygon(GLUtesselator*) -->
     <function-decl name='gluTessEndPolygon' mangled-name='gluTessEndPolygon' filepath='libtess/tess.c' line='500' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessEndPolygon'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='500' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluEndPolygon(GLUtesselator*) -->
     <function-decl name='gluEndPolygon' mangled-name='gluEndPolygon' filepath='libtess/tess.c' line='628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndPolygon'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='628' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluTessVertex(GLUtesselator*, GLdouble*, void*) -->
     <function-decl name='gluTessVertex' mangled-name='gluTessVertex' filepath='libtess/tess.c' line='415' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessVertex'>
@@ -15141,16 +15141,16 @@ 
       <!-- parameter of type 'GLdouble*' -->
       <parameter type-id='type-id-399' name='coords' filepath='libtess/tess.c' line='415' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libtess/tess.c' line='415' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libtess/tess.c' line='415' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluDeleteTess(GLUtesselator*) -->
     <function-decl name='gluDeleteTess' mangled-name='gluDeleteTess' filepath='libtess/tess.c' line='193' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDeleteTess'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='193' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- GLUtesselator* gluNewTess() -->
     <function-decl name='gluNewTess' mangled-name='gluNewTess' filepath='libtess/tess.c' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewTess'>
@@ -15164,7 +15164,7 @@ 
       <!-- parameter of type 'typedef PQHeapKey' -->
       <parameter type-id='type-id-382'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-11'/>
     </function-type>
     <!-- int (PQSortKey, PQSortKey) -->
     <function-type size-in-bits='64' id='type-id-388'>
@@ -15173,25 +15173,25 @@ 
       <!-- parameter of type 'typedef PQSortKey' -->
       <parameter type-id='type-id-383'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-11'/>
     </function-type>
     <!-- int (void*, DictListKey, DictListKey) -->
     <function-type size-in-bits='64' id='type-id-389'>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- parameter of type 'typedef DictListKey' -->
       <parameter type-id='type-id-356'/>
       <!-- parameter of type 'typedef DictListKey' -->
       <parameter type-id='type-id-356'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-11'/>
     </function-type>
     <!-- void (GLUmesh*) -->
     <function-type size-in-bits='64' id='type-id-390'>
       <!-- parameter of type 'GLUmesh*' -->
       <parameter type-id='type-id-334'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (GLdouble*, void**, GLfloat*, void**) -->
     <function-type size-in-bits='64' id='type-id-391'>
@@ -15204,7 +15204,7 @@ 
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-185'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (GLdouble*, void**, GLfloat*, void**, void*) -->
     <function-type size-in-bits='64' id='type-id-392'>
@@ -15217,57 +15217,57 @@ 
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-185'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (GLboolean) -->
     <function-type size-in-bits='64' id='type-id-393'>
       <!-- parameter of type 'typedef GLboolean' -->
       <parameter type-id='type-id-42'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (GLboolean, void*) -->
     <function-type size-in-bits='64' id='type-id-394'>
       <!-- parameter of type 'typedef GLboolean' -->
       <parameter type-id='type-id-42'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (GLenum) -->
     <function-type size-in-bits='64' id='type-id-395'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25'/>
+      <parameter type-id='type-id-28'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (GLenum, void*) -->
     <function-type size-in-bits='64' id='type-id-396'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25'/>
+      <parameter type-id='type-id-28'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (void*) -->
     <function-type size-in-bits='64' id='type-id-397'>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (void*, void*) -->
     <function-type size-in-bits='64' id='type-id-398'>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libutil/error.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
@@ -15278,7 +15278,7 @@ 
     <!-- typedef unsigned char GLubyte -->
     <typedef-decl name='GLubyte' type-id='type-id-400' filepath='../../../include/GL/gl.h' line='156' column='1' id='type-id-401'/>
     <!-- typedef unsigned int GLenum -->
-    <typedef-decl name='GLenum' type-id='type-id-230' filepath='../../../include/GL/gl.h' line='149' column='1' id='type-id-25'/>
+    <typedef-decl name='GLenum' type-id='type-id-230' filepath='../../../include/GL/gl.h' line='149' column='1' id='type-id-28'/>
     <!-- const GLubyte -->
     <qualified-type-def type-id='type-id-401' const='yes' id='type-id-402'/>
     <!-- const GLubyte* -->
@@ -15286,26 +15286,26 @@ 
     <!-- const GLubyte* gluErrorString(GLenum) -->
     <function-decl name='gluErrorString' mangled-name='gluErrorString' filepath='libutil/error.c' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluErrorString'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='errorCode' filepath='libutil/error.c' line='66' column='1'/>
+      <parameter type-id='type-id-28' name='errorCode' filepath='libutil/error.c' line='66' column='1'/>
       <!-- const GLubyte* -->
       <return type-id='type-id-403'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libutil/mipmap.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- int -->
-    <type-decl name='int' size-in-bits='32' id='type-id-10'/>
+    <type-decl name='int' size-in-bits='32' id='type-id-11'/>
     <!-- void -->
-    <type-decl name='void' id='type-id-11'/>
+    <type-decl name='void' id='type-id-12'/>
     <!-- typedef int GLint -->
-    <typedef-decl name='GLint' type-id='type-id-10' filepath='../../../include/GL/gl.h' line='155' column='1' id='type-id-60'/>
+    <typedef-decl name='GLint' type-id='type-id-11' filepath='../../../include/GL/gl.h' line='155' column='1' id='type-id-60'/>
     <!-- typedef int GLsizei -->
-    <typedef-decl name='GLsizei' type-id='type-id-10' filepath='../../../include/GL/gl.h' line='159' column='1' id='type-id-404'/>
+    <typedef-decl name='GLsizei' type-id='type-id-11' filepath='../../../include/GL/gl.h' line='159' column='1' id='type-id-404'/>
     <!-- void* -->
-    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-22'/>
+    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-25'/>
     <!-- GLint gluBuild3DMipmaps(GLenum, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, void*) -->
     <function-decl name='gluBuild3DMipmaps' mangled-name='gluBuild3DMipmaps' filepath='libutil/mipmap.c' line='8482' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild3DMipmaps'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='8482' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='8482' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='8482' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
@@ -15315,18 +15315,18 @@ 
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='depth' filepath='libutil/mipmap.c' line='8483' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='8484' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='8484' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='8484' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='8484' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='8484' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='8484' column='1'/>
       <!-- typedef GLint -->
       <return type-id='type-id-60'/>
     </function-decl>
     <!-- GLint gluBuild3DMipmapLevels(GLenum, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, GLint, GLint, GLint, void*) -->
     <function-decl name='gluBuild3DMipmapLevels' mangled-name='gluBuild3DMipmapLevels' filepath='libutil/mipmap.c' line='8444' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild3DMipmapLevels'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='8444' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='8444' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='8444' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
@@ -15336,9 +15336,9 @@ 
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='depth' filepath='libutil/mipmap.c' line='8445' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='8446' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='8446' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='8446' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='8446' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='userLevel' filepath='libutil/mipmap.c' line='8447' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
@@ -15346,62 +15346,62 @@ 
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='maxLevel' filepath='libutil/mipmap.c' line='8447' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='8448' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='8448' column='1'/>
       <!-- typedef GLint -->
       <return type-id='type-id-60'/>
     </function-decl>
     <!-- GLint gluScaleImage(GLenum, GLsizei, GLsizei, GLenum, void*, GLsizei, GLsizei, GLenum, void*) -->
     <function-decl name='gluScaleImage' mangled-name='gluScaleImage' filepath='libutil/mipmap.c' line='3498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluScaleImage'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='3498' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='3498' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='widthin' filepath='libutil/mipmap.c' line='3498' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='heightin' filepath='libutil/mipmap.c' line='3498' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='typein' filepath='libutil/mipmap.c' line='3499' column='1'/>
+      <parameter type-id='type-id-28' name='typein' filepath='libutil/mipmap.c' line='3499' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='datain' filepath='libutil/mipmap.c' line='3499' column='1'/>
+      <parameter type-id='type-id-25' name='datain' filepath='libutil/mipmap.c' line='3499' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='widthout' filepath='libutil/mipmap.c' line='3500' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='heightout' filepath='libutil/mipmap.c' line='3500' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='typeout' filepath='libutil/mipmap.c' line='3500' column='1'/>
+      <parameter type-id='type-id-28' name='typeout' filepath='libutil/mipmap.c' line='3500' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='dataout' filepath='libutil/mipmap.c' line='3501' column='1'/>
+      <parameter type-id='type-id-25' name='dataout' filepath='libutil/mipmap.c' line='3501' column='1'/>
       <!-- typedef GLint -->
       <return type-id='type-id-60'/>
     </function-decl>
     <!-- GLint gluBuild1DMipmaps(GLenum, GLint, GLsizei, GLenum, GLenum, void*) -->
     <function-decl name='gluBuild1DMipmaps' mangled-name='gluBuild1DMipmaps' filepath='libutil/mipmap.c' line='3672' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild1DMipmaps'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='3672' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='3672' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='3672' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='width' filepath='libutil/mipmap.c' line='3672' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='3673' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='3673' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='3673' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='3673' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='3674' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='3674' column='1'/>
       <!-- typedef GLint -->
       <return type-id='type-id-60'/>
     </function-decl>
     <!-- GLint gluBuild1DMipmapLevels(GLenum, GLint, GLsizei, GLenum, GLenum, GLint, GLint, GLint, void*) -->
     <function-decl name='gluBuild1DMipmapLevels' mangled-name='gluBuild1DMipmapLevels' filepath='libutil/mipmap.c' line='3643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild1DMipmapLevels'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='3643' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='3643' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='3643' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='width' filepath='libutil/mipmap.c' line='3644' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='3645' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='3645' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='3645' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='3645' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='userLevel' filepath='libutil/mipmap.c' line='3646' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
@@ -15409,14 +15409,14 @@ 
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='maxLevel' filepath='libutil/mipmap.c' line='3646' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='3647' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='3647' column='1'/>
       <!-- typedef GLint -->
       <return type-id='type-id-60'/>
     </function-decl>
     <!-- GLint gluBuild2DMipmaps(GLenum, GLint, GLsizei, GLsizei, GLenum, GLenum, void*) -->
     <function-decl name='gluBuild2DMipmaps' mangled-name='gluBuild2DMipmaps' filepath='libutil/mipmap.c' line='4584' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild2DMipmaps'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='4584' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='4584' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='4584' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
@@ -15424,18 +15424,18 @@ 
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='height' filepath='libutil/mipmap.c' line='4585' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='4586' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='4586' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='4586' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='4586' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='4587' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='4587' column='1'/>
       <!-- typedef GLint -->
       <return type-id='type-id-60'/>
     </function-decl>
     <!-- GLint gluBuild2DMipmapLevels(GLenum, GLint, GLsizei, GLsizei, GLenum, GLenum, GLint, GLint, GLint, void*) -->
     <function-decl name='gluBuild2DMipmapLevels' mangled-name='gluBuild2DMipmapLevels' filepath='libutil/mipmap.c' line='4552' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild2DMipmapLevels'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='4552' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='4552' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='4552' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
@@ -15443,9 +15443,9 @@ 
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='height' filepath='libutil/mipmap.c' line='4553' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='4554' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='4554' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='4554' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='4554' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='userLevel' filepath='libutil/mipmap.c' line='4555' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
@@ -15453,7 +15453,7 @@ 
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='maxLevel' filepath='libutil/mipmap.c' line='4555' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='4556' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='4556' column='1'/>
       <!-- typedef GLint -->
       <return type-id='type-id-60'/>
     </function-decl>
@@ -15567,7 +15567,7 @@ 
       <!-- parameter of type 'GLint*' -->
       <parameter type-id='type-id-407' name='viewport' filepath='libutil/project.c' line='349' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluLookAt(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble) -->
     <function-decl name='gluLookAt' mangled-name='gluLookAt' filepath='libutil/project.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluLookAt'>
@@ -15590,7 +15590,7 @@ 
       <!-- parameter of type 'typedef GLdouble' -->
       <parameter type-id='type-id-321' name='upz' filepath='libutil/project.c' line='110' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluPerspective(GLdouble, GLdouble, GLdouble, GLdouble) -->
     <function-decl name='gluPerspective' mangled-name='gluPerspective' filepath='libutil/project.c' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluPerspective'>
@@ -15603,7 +15603,7 @@ 
       <!-- parameter of type 'typedef GLdouble' -->
       <parameter type-id='type-id-321' name='zFar' filepath='libutil/project.c' line='65' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluOrtho2D(GLdouble, GLdouble, GLdouble, GLdouble) -->
     <function-decl name='gluOrtho2D' mangled-name='gluOrtho2D' filepath='libutil/project.c' line='57' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluOrtho2D'>
@@ -15616,7 +15616,7 @@ 
       <!-- parameter of type 'typedef GLdouble' -->
       <parameter type-id='type-id-321' name='top' filepath='libutil/project.c' line='57' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libutil/quad.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
@@ -15648,11 +15648,11 @@ 
     <!-- typedef unsigned char GLboolean -->
     <typedef-decl name='GLboolean' type-id='type-id-400' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-42'/>
     <!-- typedef void ()* _GLUfuncptr -->
-    <typedef-decl name='_GLUfuncptr' type-id='type-id-17' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-26'/>
+    <typedef-decl name='_GLUfuncptr' type-id='type-id-20' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-29'/>
     <!-- GLUquadric* -->
     <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-414'/>
     <!-- void ()* -->
-    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-17'/>
+    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-20'/>
     <!-- void (typedef GLint)* -->
     <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-413'/>
     <!-- void gluQuadricCallback(GLUquadric*, GLenum, _GLUfuncptr) -->
@@ -15660,20 +15660,20 @@ 
       <!-- parameter of type 'GLUquadric*' -->
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='86' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='which' filepath='libutil/quad.c' line='86' column='1'/>
+      <parameter type-id='type-id-28' name='which' filepath='libutil/quad.c' line='86' column='1'/>
       <!-- parameter of type 'typedef _GLUfuncptr' -->
-      <parameter type-id='type-id-26' name='fn' filepath='libutil/quad.c' line='86' column='1'/>
+      <parameter type-id='type-id-29' name='fn' filepath='libutil/quad.c' line='86' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluQuadricNormals(GLUquadric*, GLenum) -->
     <function-decl name='gluQuadricNormals' mangled-name='gluQuadricNormals' filepath='libutil/quad.c' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricNormals'>
       <!-- parameter of type 'GLUquadric*' -->
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='99' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='normals' filepath='libutil/quad.c' line='99' column='1'/>
+      <parameter type-id='type-id-28' name='normals' filepath='libutil/quad.c' line='99' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluQuadricTexture(GLUquadric*, GLboolean) -->
     <function-decl name='gluQuadricTexture' mangled-name='gluQuadricTexture' filepath='libutil/quad.c' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricTexture'>
@@ -15682,25 +15682,25 @@ 
       <!-- parameter of type 'typedef GLboolean' -->
       <parameter type-id='type-id-42' name='textureCoords' filepath='libutil/quad.c' line='114' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluQuadricOrientation(GLUquadric*, GLenum) -->
     <function-decl name='gluQuadricOrientation' mangled-name='gluQuadricOrientation' filepath='libutil/quad.c' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricOrientation'>
       <!-- parameter of type 'GLUquadric*' -->
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='120' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='orientation' filepath='libutil/quad.c' line='120' column='1'/>
+      <parameter type-id='type-id-28' name='orientation' filepath='libutil/quad.c' line='120' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluQuadricDrawStyle(GLUquadric*, GLenum) -->
     <function-decl name='gluQuadricDrawStyle' mangled-name='gluQuadricDrawStyle' filepath='libutil/quad.c' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricDrawStyle'>
       <!-- parameter of type 'GLUquadric*' -->
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='134' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='drawStyle' filepath='libutil/quad.c' line='134' column='1'/>
+      <parameter type-id='type-id-28' name='drawStyle' filepath='libutil/quad.c' line='134' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluSphere(GLUquadric*, GLdouble, GLint, GLint) -->
     <function-decl name='gluSphere' mangled-name='gluSphere' filepath='libutil/quad.c' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluSphere'>
@@ -15713,7 +15713,7 @@ 
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='stacks' filepath='libutil/quad.c' line='694' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluPartialDisk(GLUquadric*, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble) -->
     <function-decl name='gluPartialDisk' mangled-name='gluPartialDisk' filepath='libutil/quad.c' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluPartialDisk'>
@@ -15732,7 +15732,7 @@ 
       <!-- parameter of type 'typedef GLdouble' -->
       <parameter type-id='type-id-321' name='sweepAngle' filepath='libutil/quad.c' line='433' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluDisk(GLUquadric*, GLdouble, GLdouble, GLint, GLint) -->
     <function-decl name='gluDisk' mangled-name='gluDisk' filepath='libutil/quad.c' line='424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDisk'>
@@ -15747,7 +15747,7 @@ 
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='loops' filepath='libutil/quad.c' line='425' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluCylinder(GLUquadric*, GLdouble, GLdouble, GLdouble, GLint, GLint) -->
     <function-decl name='gluCylinder' mangled-name='gluCylinder' filepath='libutil/quad.c' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluCylinder'>
@@ -15764,14 +15764,14 @@ 
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='stacks' filepath='libutil/quad.c' line='151' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluDeleteQuadric(GLUquadric*) -->
     <function-decl name='gluDeleteQuadric' mangled-name='gluDeleteQuadric' filepath='libutil/quad.c' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDeleteQuadric'>
       <!-- parameter of type 'GLUquadric*' -->
       <parameter type-id='type-id-414' name='state' filepath='libutil/quad.c' line='73' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- GLUquadric* gluNewQuadric() -->
     <function-decl name='gluNewQuadric' mangled-name='gluNewQuadric' filepath='libutil/quad.c' line='54' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewQuadric'>
@@ -15781,21 +15781,21 @@ 
     <!-- void () -->
     <function-type size-in-bits='64' id='type-id-415'>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (GLint) -->
     <function-type size-in-bits='64' id='type-id-416'>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libutil/registry.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- const GLubyte* gluGetString(GLenum) -->
     <function-decl name='gluGetString' mangled-name='gluGetString' filepath='libutil/registry.c' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetString'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='name' filepath='libutil/registry.c' line='44' column='1'/>
+      <parameter type-id='type-id-28' name='name' filepath='libutil/registry.c' line='44' column='1'/>
       <!-- const GLubyte* -->
       <return type-id='type-id-403'/>
     </function-decl>
diff --git a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
index fcd70f57..57a8defb 100644
--- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -4914,7 +4914,7 @@ 
       </member-type>
       <member-type access='private'>
         <!-- struct HeapLeakChecker::Allocator -->
-        <class-decl name='Allocator' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/heap-checker.cc' line='292' column='1' is-declaration-only='yes' id='type-id-247'>
+        <class-decl name='Allocator' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/heap-checker.cc' line='292' column='1' id='type-id-247'>
           <data-member access='private' static='yes'>
             <!-- static LowLevelAlloc::Arena* HeapLeakChecker::Allocator::arena_ -->
             <var-decl name='arena_' type-id='type-id-74' mangled-name='_ZN15HeapLeakChecker9Allocator6arena_E' visibility='default' filepath='src/heap-checker.cc' line='333' column='1' elf-symbol-id='_ZN15HeapLeakChecker9Allocator6arena_E'/>
@@ -23557,416 +23557,72 @@ 
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
-    <!-- class MallocExtension -->
-    <class-decl name='MallocExtension' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='90' column='1' is-declaration-only='yes' id='type-id-894'>
-      <member-type access='private'>
-        <!-- enum MallocExtension::Ownership -->
-        <enum-decl name='Ownership' filepath='./src/gperftools/malloc_extension.h' line='315' column='1' id='type-id-898'>
-          <underlying-type type-id='type-id-133'/>
-          <enumerator name='kUnknownOwnership' value='0'/>
-          <enumerator name='kOwned' value='1'/>
-          <enumerator name='kNotOwned' value='2'/>
-        </enum-decl>
-      </member-type>
-      <member-type access='private'>
-        <!-- struct MallocExtension::FreeListInfo -->
-        <class-decl name='FreeListInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='333' column='1' id='type-id-899'>
-          <data-member access='public' layout-offset-in-bits='0'>
-            <!-- size_t MallocExtension::FreeListInfo::min_object_size -->
-            <var-decl name='min_object_size' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='334' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='64'>
-            <!-- size_t MallocExtension::FreeListInfo::max_object_size -->
-            <var-decl name='max_object_size' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='335' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='128'>
-            <!-- size_t MallocExtension::FreeListInfo::total_bytes_free -->
-            <var-decl name='total_bytes_free' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='336' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='192'>
-            <!-- const char* MallocExtension::FreeListInfo::type -->
-            <var-decl name='type' type-id='type-id-52' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='337' column='1'/>
-          </data-member>
-        </class-decl>
-      </member-type>
-      <member-type access='private'>
-        <!-- typedef void (void*, const base::MallocRange*) MallocExtension::RangeFunction -->
-        <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-895'/>
-      </member-type>
-      <member-function access='private' static='yes'>
-        <!-- void MallocExtension::Initialize() -->
-        <function-decl name='Initialize' mangled-name='_ZN15MallocExtension10InitializeEv' filepath='src/malloc_extension.cc' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension10InitializeEv'>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <!-- MallocExtension* MallocExtension::instance() -->
-        <function-decl name='instance' mangled-name='_ZN15MallocExtension8instanceEv' filepath='src/malloc_extension.cc' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8instanceEv'>
-          <!-- MallocExtension* -->
-          <return type-id='type-id-259'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private'>
-        <!-- void MallocExtension::Register() -->
-        <function-decl name='Register' mangled-name='_ZN15MallocExtension8RegisterEPS_' filepath='src/malloc_extension.cc' line='217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8RegisterEPS_'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes' vtable-offset='-1'>
-        <!-- MallocExtension::~MallocExtension(int) -->
-        <function-decl name='~MallocExtension' mangled-name='_ZN15MallocExtensionD1Ev' filepath='src/malloc_extension.cc' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtensionD1Ev'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-1' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='2'>
-        <!-- bool MallocExtension::VerifyAllMemory() -->
-        <function-decl name='VerifyAllMemory' mangled-name='_ZN15MallocExtension15VerifyAllMemoryEv' filepath='src/malloc_extension.cc' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15VerifyAllMemoryEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='3'>
-        <!-- bool MallocExtension::VerifyNewMemory(void*) -->
-        <function-decl name='VerifyNewMemory' mangled-name='_ZN15MallocExtension15VerifyNewMemoryEPKv' filepath='src/malloc_extension.cc' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15VerifyNewMemoryEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='4'>
-        <!-- bool MallocExtension::VerifyArrayNewMemory(void*) -->
-        <function-decl name='VerifyArrayNewMemory' mangled-name='_ZN15MallocExtension20VerifyArrayNewMemoryEPKv' filepath='src/malloc_extension.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20VerifyArrayNewMemoryEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='5'>
-        <!-- bool MallocExtension::VerifyMallocMemory(void*) -->
-        <function-decl name='VerifyMallocMemory' mangled-name='_ZN15MallocExtension18VerifyMallocMemoryEPKv' filepath='src/malloc_extension.cc' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18VerifyMallocMemoryEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='6'>
-        <!-- bool MallocExtension::MallocMemoryStats(int*, size_t*, int*) -->
-        <function-decl name='MallocMemoryStats' mangled-name='_ZN15MallocExtension17MallocMemoryStatsEPiPmS0_' filepath='src/malloc_extension.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension17MallocMemoryStatsEPiPmS0_'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'int*' -->
-          <parameter type-id='type-id-897'/>
-          <!-- parameter of type 'size_t*' -->
-          <parameter type-id='type-id-230'/>
-          <!-- parameter of type 'int*' -->
-          <parameter type-id='type-id-897'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='7'>
-        <!-- void MallocExtension::GetStats(char*, int) -->
-        <function-decl name='GetStats' mangled-name='_ZN15MallocExtension8GetStatsEPci' filepath='src/malloc_extension.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8GetStatsEPci'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-90'/>
-          <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-1'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='8'>
-        <!-- void MallocExtension::GetHeapSample(MallocExtensionWriter*) -->
-        <function-decl name='GetHeapSample' mangled-name='_ZN15MallocExtension13GetHeapSampleEPSs' filepath='src/malloc_extension.cc' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension13GetHeapSampleEPSs'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'MallocExtensionWriter*' -->
-          <parameter type-id='type-id-901'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='9'>
-        <!-- void MallocExtension::GetHeapGrowthStacks(MallocExtensionWriter*) -->
-        <function-decl name='GetHeapGrowthStacks' mangled-name='_ZN15MallocExtension19GetHeapGrowthStacksEPSs' filepath='src/malloc_extension.cc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension19GetHeapGrowthStacksEPSs'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'MallocExtensionWriter*' -->
-          <parameter type-id='type-id-901'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='10'>
-        <!-- void MallocExtension::Ranges(void*, MallocExtension::RangeFunction*) -->
-        <function-decl name='Ranges' mangled-name='_ZN15MallocExtension6RangesEPvPFvS0_PKN4base11MallocRangeEE' filepath='src/malloc_extension.cc' line='340' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension6RangesEPvPFvS0_PKN4base11MallocRangeEE'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- parameter of type 'MallocExtension::RangeFunction*' -->
-          <parameter type-id='type-id-896'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='11'>
-        <!-- bool MallocExtension::GetNumericProperty(const char*, size_t*) -->
-        <function-decl name='GetNumericProperty' mangled-name='_ZN15MallocExtension18GetNumericPropertyEPKcPm' filepath='src/malloc_extension.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18GetNumericPropertyEPKcPm'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'const char*' -->
-          <parameter type-id='type-id-52'/>
-          <!-- parameter of type 'size_t*' -->
-          <parameter type-id='type-id-230'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='12'>
-        <!-- bool MallocExtension::SetNumericProperty(const char*, size_t) -->
-        <function-decl name='SetNumericProperty' mangled-name='_ZN15MallocExtension18SetNumericPropertyEPKcm' filepath='src/malloc_extension.cc' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18SetNumericPropertyEPKcm'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'const char*' -->
-          <parameter type-id='type-id-52'/>
-          <!-- parameter of type 'typedef size_t' -->
-          <parameter type-id='type-id-57'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='13'>
-        <!-- void MallocExtension::MarkThreadIdle() -->
-        <function-decl name='MarkThreadIdle' mangled-name='_ZN15MallocExtension14MarkThreadIdleEv' filepath='src/malloc_extension.cc' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension14MarkThreadIdleEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='14'>
-        <!-- void MallocExtension::MarkThreadBusy() -->
-        <function-decl name='MarkThreadBusy' mangled-name='_ZN15MallocExtension14MarkThreadBusyEv' filepath='src/malloc_extension.cc' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension14MarkThreadBusyEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='15'>
-        <!-- SysAllocator* MallocExtension::GetSystemAllocator() -->
-        <function-decl name='GetSystemAllocator' mangled-name='_ZN15MallocExtension18GetSystemAllocatorEv' filepath='src/malloc_extension.cc' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18GetSystemAllocatorEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- SysAllocator* -->
-          <return type-id='type-id-902'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='16'>
-        <!-- void MallocExtension::SetSystemAllocator(SysAllocator*) -->
-        <function-decl name='SetSystemAllocator' mangled-name='_ZN15MallocExtension18SetSystemAllocatorEP12SysAllocator' filepath='src/malloc_extension.cc' line='158' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18SetSystemAllocatorEP12SysAllocator'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'SysAllocator*' -->
-          <parameter type-id='type-id-902'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='17'>
-        <!-- void MallocExtension::ReleaseToSystem(size_t) -->
-        <function-decl name='ReleaseToSystem' mangled-name='_ZN15MallocExtension15ReleaseToSystemEm' filepath='src/malloc_extension.cc' line='162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15ReleaseToSystemEm'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'typedef size_t' -->
-          <parameter type-id='type-id-57'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='18'>
-        <!-- void MallocExtension::ReleaseFreeMemory() -->
-        <function-decl name='ReleaseFreeMemory' mangled-name='_ZN15MallocExtension17ReleaseFreeMemoryEv' filepath='src/malloc_extension.cc' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension17ReleaseFreeMemoryEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='19'>
-        <!-- void MallocExtension::SetMemoryReleaseRate(double) -->
-        <function-decl name='SetMemoryReleaseRate' mangled-name='_ZN15MallocExtension20SetMemoryReleaseRateEd' filepath='src/malloc_extension.cc' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20SetMemoryReleaseRateEd'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'double' -->
-          <parameter type-id='type-id-2'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='20'>
-        <!-- double MallocExtension::GetMemoryReleaseRate() -->
-        <function-decl name='GetMemoryReleaseRate' mangled-name='_ZN15MallocExtension20GetMemoryReleaseRateEv' filepath='src/malloc_extension.cc' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20GetMemoryReleaseRateEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- double -->
-          <return type-id='type-id-2'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='21'>
-        <!-- size_t MallocExtension::GetEstimatedAllocatedSize(size_t) -->
-        <function-decl name='GetEstimatedAllocatedSize' mangled-name='_ZN15MallocExtension25GetEstimatedAllocatedSizeEm' filepath='src/malloc_extension.cc' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension25GetEstimatedAllocatedSizeEm'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'typedef size_t' -->
-          <parameter type-id='type-id-57'/>
-          <!-- typedef size_t -->
-          <return type-id='type-id-57'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='22'>
-        <!-- size_t MallocExtension::GetAllocatedSize(void*) -->
-        <function-decl name='GetAllocatedSize' mangled-name='_ZN15MallocExtension16GetAllocatedSizeEPKv' filepath='src/malloc_extension.cc' line='182' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension16GetAllocatedSizeEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- typedef size_t -->
-          <return type-id='type-id-57'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='23'>
-        <!-- MallocExtension::Ownership MallocExtension::GetOwnership(void*) -->
-        <function-decl name='GetOwnership' mangled-name='_ZN15MallocExtension12GetOwnershipEPKv' filepath='src/malloc_extension.cc' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension12GetOwnershipEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- enum MallocExtension::Ownership -->
-          <return type-id='type-id-898'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='24'>
-        <!-- void MallocExtension::GetFreeListSizes(std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*) -->
-        <function-decl name='GetFreeListSizes' mangled-name='_ZN15MallocExtension16GetFreeListSizesEPSt6vectorINS_12FreeListInfoESaIS1_EE' filepath='src/malloc_extension.cc' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension16GetFreeListSizesEPSt6vectorINS_12FreeListInfoESaIS1_EE'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-          <parameter type-id='type-id-903'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='25'>
-        <!-- void** MallocExtension::ReadStackTraces(int*) -->
-        <function-decl name='ReadStackTraces' mangled-name='_ZN15MallocExtension15ReadStackTracesEPi' filepath='src/malloc_extension.cc' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15ReadStackTracesEPi'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'int*' -->
-          <parameter type-id='type-id-897'/>
-          <!-- void** -->
-          <return type-id='type-id-120'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='26'>
-        <!-- void** MallocExtension::ReadHeapGrowthStackTraces() -->
-        <function-decl name='ReadHeapGrowthStackTraces' mangled-name='_ZN15MallocExtension25ReadHeapGrowthStackTracesEv' filepath='src/malloc_extension.cc' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension25ReadHeapGrowthStackTracesEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void** -->
-          <return type-id='type-id-120'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/malloc_hook.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- typedef void (void*, typedef size_t, int, int, int, typedef off_t)* MallocHook_PreMmapHook -->
-    <typedef-decl name='MallocHook_PreMmapHook' type-id='type-id-904' filepath='./src/gperftools/malloc_hook_c.h' line='87' column='1' id='type-id-905'/>
+    <typedef-decl name='MallocHook_PreMmapHook' type-id='type-id-898' filepath='./src/gperftools/malloc_hook_c.h' line='87' column='1' id='type-id-899'/>
     <!-- typedef int (void*, typedef size_t, int, int, int, typedef off_t, void**)* MallocHook_MmapReplacement -->
-    <typedef-decl name='MallocHook_MmapReplacement' type-id='type-id-906' filepath='./src/gperftools/malloc_hook_c.h' line='111' column='1' id='type-id-907'/>
+    <typedef-decl name='MallocHook_MmapReplacement' type-id='type-id-900' filepath='./src/gperftools/malloc_hook_c.h' line='111' column='1' id='type-id-901'/>
     <!-- typedef int (void*, typedef size_t, int*)* MallocHook_MunmapReplacement -->
-    <typedef-decl name='MallocHook_MunmapReplacement' type-id='type-id-908' filepath='./src/gperftools/malloc_hook_c.h' line='123' column='1' id='type-id-909'/>
+    <typedef-decl name='MallocHook_MunmapReplacement' type-id='type-id-902' filepath='./src/gperftools/malloc_hook_c.h' line='123' column='1' id='type-id-903'/>
     <!-- typedef void (void*, typedef size_t)* MallocHook_MunmapHook -->
-    <typedef-decl name='MallocHook_MunmapHook' type-id='type-id-363' filepath='./src/gperftools/malloc_hook_c.h' line='115' column='1' id='type-id-910'/>
+    <typedef-decl name='MallocHook_MunmapHook' type-id='type-id-363' filepath='./src/gperftools/malloc_hook_c.h' line='115' column='1' id='type-id-904'/>
     <!-- typedef void (void*, void*, typedef size_t, typedef size_t, int, void*)* MallocHook_MremapHook -->
-    <typedef-decl name='MallocHook_MremapHook' type-id='type-id-911' filepath='./src/gperftools/malloc_hook_c.h' line='132' column='1' id='type-id-912'/>
+    <typedef-decl name='MallocHook_MremapHook' type-id='type-id-905' filepath='./src/gperftools/malloc_hook_c.h' line='132' column='1' id='type-id-906'/>
     <!-- typedef void (typedef ptrdiff_t)* MallocHook_PreSbrkHook -->
-    <typedef-decl name='MallocHook_PreSbrkHook' type-id='type-id-913' filepath='./src/gperftools/malloc_hook_c.h' line='138' column='1' id='type-id-914'/>
+    <typedef-decl name='MallocHook_PreSbrkHook' type-id='type-id-907' filepath='./src/gperftools/malloc_hook_c.h' line='138' column='1' id='type-id-908'/>
     <!-- base::internal::HookList<int (*)(const void*, size_t, int*)>* -->
-    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-916'/>
+    <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-910'/>
     <!-- base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>* -->
-    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-918'/>
+    <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-912'/>
     <!-- base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>* -->
-    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-920'/>
+    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-914'/>
     <!-- base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>* -->
-    <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-922'/>
+    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-916'/>
     <!-- base::internal::HookList<void (*)(ptrdiff_t)>* -->
-    <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-924'/>
+    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-918'/>
     <!-- const base::internal::HookList<int (*)(const void*, size_t, int*)> -->
-    <qualified-type-def type-id='type-id-915' const='yes' id='type-id-925'/>
+    <qualified-type-def type-id='type-id-909' const='yes' id='type-id-919'/>
     <!-- const base::internal::HookList<int (*)(const void*, size_t, int*)>* -->
-    <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-926'/>
+    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-920'/>
     <!-- const base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)> -->
-    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-927'/>
+    <qualified-type-def type-id='type-id-911' const='yes' id='type-id-921'/>
     <!-- const base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>* -->
-    <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-928'/>
+    <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-922'/>
     <!-- const base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)> -->
-    <qualified-type-def type-id='type-id-919' const='yes' id='type-id-929'/>
+    <qualified-type-def type-id='type-id-913' const='yes' id='type-id-923'/>
     <!-- const base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>* -->
-    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-930'/>
+    <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-924'/>
     <!-- const base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)> -->
-    <qualified-type-def type-id='type-id-921' const='yes' id='type-id-931'/>
+    <qualified-type-def type-id='type-id-915' const='yes' id='type-id-925'/>
     <!-- const base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>* -->
-    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-932'/>
+    <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-926'/>
     <!-- const base::internal::HookList<void (*)(ptrdiff_t)> -->
-    <qualified-type-def type-id='type-id-923' const='yes' id='type-id-933'/>
+    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-927'/>
     <!-- const base::internal::HookList<void (*)(ptrdiff_t)>* -->
-    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-934'/>
+    <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-928'/>
     <!-- int (void*, typedef size_t, int*)* -->
-    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-908'/>
+    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-902'/>
     <!-- int (void*, typedef size_t, int*)** -->
-    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-936'/>
+    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-930'/>
     <!-- int (void*, typedef size_t, int, int, int, typedef off_t, void**)* -->
-    <pointer-type-def type-id='type-id-937' size-in-bits='64' id='type-id-906'/>
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-900'/>
     <!-- int (void*, typedef size_t, int, int, int, typedef off_t, void**)** -->
-    <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-938'/>
+    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-932'/>
     <!-- void (typedef ptrdiff_t)* -->
-    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-913'/>
+    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-907'/>
     <!-- void (typedef ptrdiff_t)** -->
-    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-940'/>
+    <pointer-type-def type-id='type-id-907' size-in-bits='64' id='type-id-934'/>
     <!-- void (void*, typedef size_t, int, int, int, typedef off_t)* -->
-    <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-904'/>
+    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-898'/>
     <!-- void (void*, typedef size_t, int, int, int, typedef off_t)** -->
-    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-942'/>
+    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-936'/>
     <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)* -->
-    <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-911'/>
+    <pointer-type-def type-id='type-id-937' size-in-bits='64' id='type-id-905'/>
     <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)** -->
-    <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-944'/>
+    <pointer-type-def type-id='type-id-905' size-in-bits='64' id='type-id-938'/>
     <!-- volatile base::subtle::Atomic64* -->
-    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-946'/>
+    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-940'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
       <!-- void** std::__copy_move_a<false, void**, void**>(void**, void**, void**) -->
@@ -24008,7 +23664,7 @@ 
       <!-- namespace base::internal -->
       <namespace-decl name='internal'>
         <!-- struct base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)> -->
-        <class-decl name='HookList&lt;void (*)(const void*, size_t, int, int, int, off_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-921'>
+        <class-decl name='HookList&lt;void (*)(const void*, size_t, int, int, int, off_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-915'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- AtomicWord base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::priv_end -->
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
@@ -24021,9 +23677,9 @@ 
             <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Add(void (void*, typedef size_t, int, int, int, typedef off_t)*) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
-              <parameter type-id='type-id-922' is-artificial='yes'/><