diff --git a/include/Ref.h b/include/Ref.h
index 63255546c40bd2043a300ba82cdb505937ea7427..16c980802ea918265d06c76cb2364117a6b0d8da 100644
--- a/include/Ref.h
+++ b/include/Ref.h
@@ -23,7 +23,7 @@ public:
 
 #ifdef USE_NIFLIB_TEMPLATE_HELPERS
    template<typename U> Ref( const Ref<U>& other ) { 
-      if ( (NULL != other._object) && other._object->IsDerivedType(T::TypeConst()) ) {
+      if ( (NULL != other._object) && other._object->IsDerivedType(T::TYPE) ) {
          _object = static_cast<T*>(other._object);
          if ( _object != NULL )
             _object->AddRef();
diff --git a/include/obj/ABoneLODController.h b/include/obj/ABoneLODController.h
index d23e61478ad146559a557cf3752451c5819eb61a..29127e8f8b67e31673bce585bf631adab2ce5aee 100644
--- a/include/obj/ABoneLODController.h
+++ b/include/obj/ABoneLODController.h
@@ -25,10 +25,7 @@ public:
 	NIFLIB_API ABoneLODController();
 	NIFLIB_API ~ABoneLODController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/AKeyedData.h b/include/obj/AKeyedData.h
index 394e97984e988304de54c6e967a03081683e3ee6..d9f6062338f59a8cdf99347ec3856204f340d87f 100644
--- a/include/obj/AKeyedData.h
+++ b/include/obj/AKeyedData.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API AKeyedData();
 	NIFLIB_API ~AKeyedData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/APSysCtlr.h b/include/obj/APSysCtlr.h
index d525d806cdca87b57a86558250839821bc360c9d..39ecbc0b5b2beef06e7e18dbf4cea348653478ee 100644
--- a/include/obj/APSysCtlr.h
+++ b/include/obj/APSysCtlr.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API APSysCtlr();
 	NIFLIB_API ~APSysCtlr();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/APSysData.h b/include/obj/APSysData.h
index acbf4ef651c18be59904c0386fe2204117e7bd89..41191aca96d55cb382dc2b9b8ea1ad150c241140 100644
--- a/include/obj/APSysData.h
+++ b/include/obj/APSysData.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API APSysData();
 	NIFLIB_API ~APSysData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/AParticleModifier.h b/include/obj/AParticleModifier.h
index 1227128a2a8df11e98c47b428fa6c6e4e7715e01..e0cdcc207e7c4a2e87b569f9e05b72cb777c0c9a 100644
--- a/include/obj/AParticleModifier.h
+++ b/include/obj/AParticleModifier.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API AParticleModifier();
 	NIFLIB_API ~AParticleModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/AbhkConstraint.h b/include/obj/AbhkConstraint.h
index 584daaae889ae523b1df35f0826b4a49f8b5be4f..b01bd53f0bd7f0fd53856520c53b8963fcd320aa 100644
--- a/include/obj/AbhkConstraint.h
+++ b/include/obj/AbhkConstraint.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API AbhkConstraint();
 	NIFLIB_API ~AbhkConstraint();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/AbhkRagdollConstraint.h b/include/obj/AbhkRagdollConstraint.h
index 11f2a52ca946a93dc21b03f1af2756cfdd25848f..6dcc7e819541edb30ca22812871fdaaa77dc3acd 100644
--- a/include/obj/AbhkRagdollConstraint.h
+++ b/include/obj/AbhkRagdollConstraint.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API AbhkRagdollConstraint();
 	NIFLIB_API ~AbhkRagdollConstraint();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/AbhkShapeCollection.h b/include/obj/AbhkShapeCollection.h
index 3e13baf509febaf2c852f5ca03473445b45a751c..5b0c18aeb3d92b90c2b53747037db4c55ce01937 100644
--- a/include/obj/AbhkShapeCollection.h
+++ b/include/obj/AbhkShapeCollection.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API AbhkShapeCollection();
 	NIFLIB_API ~AbhkShapeCollection();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/AvoidNode.h b/include/obj/AvoidNode.h
index 486ca0019797c0c801b7b4096db4bf1caf474f43..9a4097b8db728adee5f146ce9efa5e08b6436946 100644
--- a/include/obj/AvoidNode.h
+++ b/include/obj/AvoidNode.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API AvoidNode();
 	NIFLIB_API ~AvoidNode();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/BSBound.h b/include/obj/BSBound.h
index 145e0342de236824227df4374126927c6645f9f6..0dccd0e2537f5270416ccfff1252f8244a6b9e75 100644
--- a/include/obj/BSBound.h
+++ b/include/obj/BSBound.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API BSBound();
 	NIFLIB_API ~BSBound();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/BSFurnitureMarker.h b/include/obj/BSFurnitureMarker.h
index db58399ef4adf542d1215e1d47cb417358033f06..7d128de4674616424e87c169643d378865725145 100644
--- a/include/obj/BSFurnitureMarker.h
+++ b/include/obj/BSFurnitureMarker.h
@@ -25,10 +25,7 @@ public:
 	NIFLIB_API BSFurnitureMarker();
 	NIFLIB_API ~BSFurnitureMarker();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/BSKeyframeController.h b/include/obj/BSKeyframeController.h
index 961def424d603e008874c0168d14d041e1bf7e07..0fc0f7fedf9affe9135d1a1363373d68efc8d3e6 100644
--- a/include/obj/BSKeyframeController.h
+++ b/include/obj/BSKeyframeController.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API BSKeyframeController();
 	NIFLIB_API ~BSKeyframeController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/BSPSysArrayEmitter.h b/include/obj/BSPSysArrayEmitter.h
index 2d56fdcaa46ff8540d5e9474c441e0f65e78dfee..fa69f7bd9c9f8dd825f07c0487bac8801e4583cc 100644
--- a/include/obj/BSPSysArrayEmitter.h
+++ b/include/obj/BSPSysArrayEmitter.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API BSPSysArrayEmitter();
 	NIFLIB_API ~BSPSysArrayEmitter();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/BSParentVelocityModifier.h b/include/obj/BSParentVelocityModifier.h
index 8a7ae38a21c558573e3b9881654aad294ff23a3c..86cc9bfaef1044dcf432f873c8f8fd03c52d1fe8 100644
--- a/include/obj/BSParentVelocityModifier.h
+++ b/include/obj/BSParentVelocityModifier.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API BSParentVelocityModifier();
 	NIFLIB_API ~BSParentVelocityModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/BSXFlags.h b/include/obj/BSXFlags.h
index e6943b8e4880a2503294c53999d27dc4a17bf22e..b00f47593b109442756c3f52b5720a7a5c7109cc 100644
--- a/include/obj/BSXFlags.h
+++ b/include/obj/BSXFlags.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API BSXFlags();
 	NIFLIB_API ~BSXFlags();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/FxButton.h b/include/obj/FxButton.h
index e7b1c3a96d69da4cc9d08f386f484e795eaf3f83..a398e0279532767c8073a2316923f023d29bbd15 100644
--- a/include/obj/FxButton.h
+++ b/include/obj/FxButton.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API FxButton();
 	NIFLIB_API ~FxButton();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/FxRadioButton.h b/include/obj/FxRadioButton.h
index 1f764ea899ff475c98cf93b4226844b69b05befc..88559fee44def5d1a3ad65010b5341616f8ff056 100644
--- a/include/obj/FxRadioButton.h
+++ b/include/obj/FxRadioButton.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API FxRadioButton();
 	NIFLIB_API ~FxRadioButton();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/FxWidget.h b/include/obj/FxWidget.h
index a1e864ff6871731f7bf1361844773b8324f358ce..8bd4ad4fc225f19b21a3c4888ee53625b60add63 100644
--- a/include/obj/FxWidget.h
+++ b/include/obj/FxWidget.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API FxWidget();
 	NIFLIB_API ~FxWidget();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiAVObject.h b/include/obj/NiAVObject.h
index dbd6e4f3198303ba8e7f7e65a9de4f5dac395ef9..20c2bfbfb825d320178e0ccd8d57472d5560762e 100644
--- a/include/obj/NiAVObject.h
+++ b/include/obj/NiAVObject.h
@@ -30,10 +30,7 @@ public:
 	NIFLIB_API NiAVObject();
 	NIFLIB_API ~NiAVObject();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiAlphaController.h b/include/obj/NiAlphaController.h
index e4c3209bc2f99b955d11c2df272b44a13529d33b..f609fe31dcfadb4399f5b0cfadeeb6982cc36d0f 100644
--- a/include/obj/NiAlphaController.h
+++ b/include/obj/NiAlphaController.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiAlphaController();
 	NIFLIB_API ~NiAlphaController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiAlphaProperty.h b/include/obj/NiAlphaProperty.h
index 874e453ec06846528a6ae31f16ec58f1d9d01e3f..1aef9043428651449c268f65789eec71563d13ae 100644
--- a/include/obj/NiAlphaProperty.h
+++ b/include/obj/NiAlphaProperty.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiAlphaProperty();
 	NIFLIB_API ~NiAlphaProperty();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiAmbientLight.h b/include/obj/NiAmbientLight.h
index 4ede505251df62f8e72f0cdbf370a8e421cf15e7..5cbfb6f71884f7814752dbae60ae9b577449be82 100644
--- a/include/obj/NiAmbientLight.h
+++ b/include/obj/NiAmbientLight.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiAmbientLight();
 	NIFLIB_API ~NiAmbientLight();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiAutoNormalParticles.h b/include/obj/NiAutoNormalParticles.h
index e51334eeb7d3918707217efdfd7840c45ee3c194..77a0ed0ce3405aead70ecd332ea28d35743265d0 100644
--- a/include/obj/NiAutoNormalParticles.h
+++ b/include/obj/NiAutoNormalParticles.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiAutoNormalParticles();
 	NIFLIB_API ~NiAutoNormalParticles();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiAutoNormalParticlesData.h b/include/obj/NiAutoNormalParticlesData.h
index 9a59e385dc2d230eaf3a5f76aaad99a24fb1ff80..f1afdc9e203dd6fc25c2cd4b6eb3c6e0222ccd5e 100644
--- a/include/obj/NiAutoNormalParticlesData.h
+++ b/include/obj/NiAutoNormalParticlesData.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiAutoNormalParticlesData();
 	NIFLIB_API ~NiAutoNormalParticlesData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBSAnimationNode.h b/include/obj/NiBSAnimationNode.h
index 122ed7a7440f446735cddafd8f45cd5ea134e50e..5496e740f1fcb57800aa96e0a587a6006a84c06f 100644
--- a/include/obj/NiBSAnimationNode.h
+++ b/include/obj/NiBSAnimationNode.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiBSAnimationNode();
 	NIFLIB_API ~NiBSAnimationNode();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBSBoneLODController.h b/include/obj/NiBSBoneLODController.h
index e906e34069dab852d1c48dc0cd23c8b3db74bd1c..5ebce2efc47e58b03708ead37485a8aca1825ad3 100644
--- a/include/obj/NiBSBoneLODController.h
+++ b/include/obj/NiBSBoneLODController.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiBSBoneLODController();
 	NIFLIB_API ~NiBSBoneLODController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBSPArrayController.h b/include/obj/NiBSPArrayController.h
index a16437eda587d79a17000f4e3dea48c1b3920db0..d147fd04f4b790137cfecf32bb94de505f6cfb3d 100644
--- a/include/obj/NiBSPArrayController.h
+++ b/include/obj/NiBSPArrayController.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiBSPArrayController();
 	NIFLIB_API ~NiBSPArrayController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBSParticleNode.h b/include/obj/NiBSParticleNode.h
index 2223fb3a14589a7711fbfe44a97d2a915f33e8f4..c4fe79b26d8a1877efa867fd0eefe0dbd4dd9d66 100644
--- a/include/obj/NiBSParticleNode.h
+++ b/include/obj/NiBSParticleNode.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiBSParticleNode();
 	NIFLIB_API ~NiBSParticleNode();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBSplineBasisData.h b/include/obj/NiBSplineBasisData.h
index cb3148e79da1f5813cd7ff27c09c257bd3b00c24..5db389ab1fd7e6e31eb28d43d7050a4bd59343a1 100644
--- a/include/obj/NiBSplineBasisData.h
+++ b/include/obj/NiBSplineBasisData.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiBSplineBasisData();
 	NIFLIB_API ~NiBSplineBasisData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBSplineCompFloatInterpolator.h b/include/obj/NiBSplineCompFloatInterpolator.h
index 9e7cf5e5a744857598077888c766a0a721ebdfd0..b150dfc4ebf33b989bd4b35ffb7dbfff98633a70 100644
--- a/include/obj/NiBSplineCompFloatInterpolator.h
+++ b/include/obj/NiBSplineCompFloatInterpolator.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiBSplineCompFloatInterpolator();
 	NIFLIB_API ~NiBSplineCompFloatInterpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBSplineCompPoint3Interpolator.h b/include/obj/NiBSplineCompPoint3Interpolator.h
index 58a63ecc1e41fe46b615768d7bc30f1a0fb97e4a..1f0a41cab6c7c0400e295c0ff6b0b658079a24d3 100644
--- a/include/obj/NiBSplineCompPoint3Interpolator.h
+++ b/include/obj/NiBSplineCompPoint3Interpolator.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API NiBSplineCompPoint3Interpolator();
 	NIFLIB_API ~NiBSplineCompPoint3Interpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBSplineCompTransformInterpolator.h b/include/obj/NiBSplineCompTransformInterpolator.h
index 005cee7225c37a87e744b1d1108d90f316462e7e..f67b7ae662bb8311d43121112ccae915ac24b6e4 100644
--- a/include/obj/NiBSplineCompTransformInterpolator.h
+++ b/include/obj/NiBSplineCompTransformInterpolator.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiBSplineCompTransformInterpolator();
 	NIFLIB_API ~NiBSplineCompTransformInterpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBSplineData.h b/include/obj/NiBSplineData.h
index 7e586561395b12f729c4ac9b4c7d7e5c3c081de3..14b27ff8018090797f36a602260e4e3ed265878d 100644
--- a/include/obj/NiBSplineData.h
+++ b/include/obj/NiBSplineData.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiBSplineData();
 	NIFLIB_API ~NiBSplineData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBSplineInterpolator.h b/include/obj/NiBSplineInterpolator.h
index 31e9a24d58664092ed3eeb82f135fb581757f604..68ffc5860956daa249ccd84661abac4a226ff834 100644
--- a/include/obj/NiBSplineInterpolator.h
+++ b/include/obj/NiBSplineInterpolator.h
@@ -25,10 +25,7 @@ public:
 	NIFLIB_API NiBSplineInterpolator();
 	NIFLIB_API ~NiBSplineInterpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBillboardNode.h b/include/obj/NiBillboardNode.h
index 635ad83113d87ce38318eddcb3f1f2f2f8b50b8a..c32facf0edff0476db21a42dc02c1be6403c1da2 100644
--- a/include/obj/NiBillboardNode.h
+++ b/include/obj/NiBillboardNode.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiBillboardNode();
 	NIFLIB_API ~NiBillboardNode();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBinaryExtraData.h b/include/obj/NiBinaryExtraData.h
index 7e0624e59adfba071b1084f43b71772e1a83e090..696335ae87704f1bf2c4021912f4a6ec587e5594 100644
--- a/include/obj/NiBinaryExtraData.h
+++ b/include/obj/NiBinaryExtraData.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API NiBinaryExtraData();
 	NIFLIB_API ~NiBinaryExtraData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBlendBoolInterpolator.h b/include/obj/NiBlendBoolInterpolator.h
index 2a42abb687a387a0eb61f825cbd9878c27af3d3c..30f99784e10a8758d864116b1ff3a3e064cb55ce 100644
--- a/include/obj/NiBlendBoolInterpolator.h
+++ b/include/obj/NiBlendBoolInterpolator.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiBlendBoolInterpolator();
 	NIFLIB_API ~NiBlendBoolInterpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBlendFloatInterpolator.h b/include/obj/NiBlendFloatInterpolator.h
index b66e27596cfb57c4eb21ad518d49b78c6c2496dc..f783fc322be252d4378b8e367dcbda5b50bdc379 100644
--- a/include/obj/NiBlendFloatInterpolator.h
+++ b/include/obj/NiBlendFloatInterpolator.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiBlendFloatInterpolator();
 	NIFLIB_API ~NiBlendFloatInterpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBlendInterpolator.h b/include/obj/NiBlendInterpolator.h
index ef509b04419fe693d09fe74cdb757a2ed116554c..fd386fa97686366f0cdc74130167884dc039ce30 100644
--- a/include/obj/NiBlendInterpolator.h
+++ b/include/obj/NiBlendInterpolator.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiBlendInterpolator();
 	NIFLIB_API ~NiBlendInterpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBlendPoint3Interpolator.h b/include/obj/NiBlendPoint3Interpolator.h
index b26ae9021bac21c3ae49206f980593fd73284986..c8a0d0e806114cf8d65250ed64f3eb9435d86559 100644
--- a/include/obj/NiBlendPoint3Interpolator.h
+++ b/include/obj/NiBlendPoint3Interpolator.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiBlendPoint3Interpolator();
 	NIFLIB_API ~NiBlendPoint3Interpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBlendTransformInterpolator.h b/include/obj/NiBlendTransformInterpolator.h
index c0bfe09b2d6609f6d83320137a2ce7d06039cb3b..5dd7e8c4b63897b3c130375b1c92d0de1d7dcfbc 100644
--- a/include/obj/NiBlendTransformInterpolator.h
+++ b/include/obj/NiBlendTransformInterpolator.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiBlendTransformInterpolator();
 	NIFLIB_API ~NiBlendTransformInterpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBoneLODController.h b/include/obj/NiBoneLODController.h
index 31022a4cb0a608a341193c2f56625b7964fdec28..6bc472bd8deedc62c40fce34f0217bbaeb5cf63f 100644
--- a/include/obj/NiBoneLODController.h
+++ b/include/obj/NiBoneLODController.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiBoneLODController();
 	NIFLIB_API ~NiBoneLODController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBoolData.h b/include/obj/NiBoolData.h
index 0d1e6456981f5e4658fcf89a3176f6489c64e543..c6a3b640eda1afdd90bf49fbc579714145013a36 100644
--- a/include/obj/NiBoolData.h
+++ b/include/obj/NiBoolData.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiBoolData();
 	NIFLIB_API ~NiBoolData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBoolInterpolator.h b/include/obj/NiBoolInterpolator.h
index 9de1893dd207347e3dd495c8cf30b39e6a344532..b3d3bd9d861ab6494197f566dffc1458438f7692 100644
--- a/include/obj/NiBoolInterpolator.h
+++ b/include/obj/NiBoolInterpolator.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiBoolInterpolator();
 	NIFLIB_API ~NiBoolInterpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBoolTimelineInterpolator.h b/include/obj/NiBoolTimelineInterpolator.h
index 6246834e31b487e9fa2c21ce805dcc15a4938e9f..c2bd46898b8cda009e01d08623db6c457f8056d4 100644
--- a/include/obj/NiBoolTimelineInterpolator.h
+++ b/include/obj/NiBoolTimelineInterpolator.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiBoolTimelineInterpolator();
 	NIFLIB_API ~NiBoolTimelineInterpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiBooleanExtraData.h b/include/obj/NiBooleanExtraData.h
index 8faae78b6096808354cfefe265e4c91334189a1b..c5ccb7607dd73c55f8adc82dfc8c081fbda747f3 100644
--- a/include/obj/NiBooleanExtraData.h
+++ b/include/obj/NiBooleanExtraData.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiBooleanExtraData();
 	NIFLIB_API ~NiBooleanExtraData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiCamera.h b/include/obj/NiCamera.h
index 208d878383179f2b79098e55aa090b7b4e810240..0bc365a0825ee6d8fb9f52e1b2a20c94e51b7fe1 100644
--- a/include/obj/NiCamera.h
+++ b/include/obj/NiCamera.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiCamera();
 	NIFLIB_API ~NiCamera();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiClod.h b/include/obj/NiClod.h
index 16682663e48591c37d6f63d4313cccaf29760d35..7bb65198f391c4f09de5e92cae3bba71bf9850b5 100644
--- a/include/obj/NiClod.h
+++ b/include/obj/NiClod.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiClod();
 	NIFLIB_API ~NiClod();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiClodData.h b/include/obj/NiClodData.h
index a055295bf617e121c367a39a2698ce6d03fde2e5..59c51185ba2c3f0d240f000b4765d5446df64a26 100644
--- a/include/obj/NiClodData.h
+++ b/include/obj/NiClodData.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiClodData();
 	NIFLIB_API ~NiClodData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiClodSkinInstance.h b/include/obj/NiClodSkinInstance.h
index 95a8d752505865a8093e2cb119e73ce9896699e3..8a1d8aea0a5a625d609cd115248a152177ed6ea3 100644
--- a/include/obj/NiClodSkinInstance.h
+++ b/include/obj/NiClodSkinInstance.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiClodSkinInstance();
 	NIFLIB_API ~NiClodSkinInstance();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiCollisionData.h b/include/obj/NiCollisionData.h
index 7b2a98f020740116b3695281d88a7c3533320a16..74ede186e7aa8b6559bcf7d02f9f38564eaafde2 100644
--- a/include/obj/NiCollisionData.h
+++ b/include/obj/NiCollisionData.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API NiCollisionData();
 	NIFLIB_API ~NiCollisionData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiCollisionObject.h b/include/obj/NiCollisionObject.h
index 27a1fd64bef7e09baaf8edb02abb67829c97f20f..07303f1529a8fed2a8cbb74846c55c5f4babdde9 100644
--- a/include/obj/NiCollisionObject.h
+++ b/include/obj/NiCollisionObject.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiCollisionObject();
 	NIFLIB_API ~NiCollisionObject();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiColorData.h b/include/obj/NiColorData.h
index 5f3af77301b098a28bcda6b83b0f1ed45c9da049..8de64eecbb0947c9509f9c678d522f4915ca7eb2 100644
--- a/include/obj/NiColorData.h
+++ b/include/obj/NiColorData.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiColorData();
 	NIFLIB_API ~NiColorData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiColorExtraData.h b/include/obj/NiColorExtraData.h
index 6806dc73c820e3eb37439b9795712d6909a18c75..2c034e935533e0c56c130c49297a7a907094edb7 100644
--- a/include/obj/NiColorExtraData.h
+++ b/include/obj/NiColorExtraData.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiColorExtraData();
 	NIFLIB_API ~NiColorExtraData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiControllerManager.h b/include/obj/NiControllerManager.h
index 1ad41d2a518c6fcd88bafee451310b19844daa98..264fdf57dba544d1cad8c74171aeffcc58382f55 100644
--- a/include/obj/NiControllerManager.h
+++ b/include/obj/NiControllerManager.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiControllerManager();
 	NIFLIB_API ~NiControllerManager();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiControllerSequence.h b/include/obj/NiControllerSequence.h
index 1158ccbb062b925432d64cbd5612b2d6342c66fe..c8d4a5442ad9609e9b819e4c96dc778f8bb53e29 100644
--- a/include/obj/NiControllerSequence.h
+++ b/include/obj/NiControllerSequence.h
@@ -31,10 +31,7 @@ public:
 	NIFLIB_API NiControllerSequence();
 	NIFLIB_API ~NiControllerSequence();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiDefaultAVObjectPalette.h b/include/obj/NiDefaultAVObjectPalette.h
index 559a466868b45f1a26fda9a2c3c3b5caec2f9900..527aa3a54877e7c6145463c7d749571d42f6be4e 100644
--- a/include/obj/NiDefaultAVObjectPalette.h
+++ b/include/obj/NiDefaultAVObjectPalette.h
@@ -26,10 +26,7 @@ public:
 	NIFLIB_API NiDefaultAVObjectPalette();
 	NIFLIB_API ~NiDefaultAVObjectPalette();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiDirectionalLight.h b/include/obj/NiDirectionalLight.h
index 4a2bc6de8b4dba8f96233e0140c584d4aabd287c..0fc79ddd7ef0f61bcb28385d853bfdce74a3d4b6 100644
--- a/include/obj/NiDirectionalLight.h
+++ b/include/obj/NiDirectionalLight.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiDirectionalLight();
 	NIFLIB_API ~NiDirectionalLight();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiDitherProperty.h b/include/obj/NiDitherProperty.h
index 9697cba3afde23ff2692dbd39db775fda8f4d828..aa124fe8ab078740bb25144a789ce502f9bb5cdd 100644
--- a/include/obj/NiDitherProperty.h
+++ b/include/obj/NiDitherProperty.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiDitherProperty();
 	NIFLIB_API ~NiDitherProperty();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiDynamicEffect.h b/include/obj/NiDynamicEffect.h
index d91433666e8e6fb7c211340d88900c7a28414205..f348ac36a5732c341b406b884ec3514b5832b0e8 100644
--- a/include/obj/NiDynamicEffect.h
+++ b/include/obj/NiDynamicEffect.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiDynamicEffect();
 	NIFLIB_API ~NiDynamicEffect();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiExtraData.h b/include/obj/NiExtraData.h
index 50339236729cf61a84a0a19138aa0f32f3b19a4e..849169512a8ba1677ce26c25e49506d48ceb6e1f 100644
--- a/include/obj/NiExtraData.h
+++ b/include/obj/NiExtraData.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API NiExtraData();
 	NIFLIB_API ~NiExtraData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiFlipController.h b/include/obj/NiFlipController.h
index c37567bffb9923e2f49d8b80237f244bbe93f4c4..47efe7c11b8a82bec65aee94ac3ef63bfba5ebe0 100644
--- a/include/obj/NiFlipController.h
+++ b/include/obj/NiFlipController.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiFlipController();
 	NIFLIB_API ~NiFlipController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiFloatData.h b/include/obj/NiFloatData.h
index 35a9fb7cd9c8faa940065755c9b3fa634591b193..5d0c048378e2423152336c9675e6b64fe208cca7 100644
--- a/include/obj/NiFloatData.h
+++ b/include/obj/NiFloatData.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiFloatData();
 	NIFLIB_API ~NiFloatData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiFloatExtraData.h b/include/obj/NiFloatExtraData.h
index 024ac43e56299cbb5ec4299f247000c1cae482ec..77284aff113648eaffe2b97df50231b9bb3029af 100644
--- a/include/obj/NiFloatExtraData.h
+++ b/include/obj/NiFloatExtraData.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiFloatExtraData();
 	NIFLIB_API ~NiFloatExtraData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiFloatExtraDataController.h b/include/obj/NiFloatExtraDataController.h
index 16ca9fc35bfa194c58416b7cb47b5835ffc22b04..2f7c9b399d9aa108facccd2ea4171973d8c6012c 100644
--- a/include/obj/NiFloatExtraDataController.h
+++ b/include/obj/NiFloatExtraDataController.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiFloatExtraDataController();
 	NIFLIB_API ~NiFloatExtraDataController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiFloatInterpolator.h b/include/obj/NiFloatInterpolator.h
index 08aaee1d42846689fe8bff01716f91344a4d5805..9e2f25c3a0abeda23921929f49e7e4bafd7b4823 100644
--- a/include/obj/NiFloatInterpolator.h
+++ b/include/obj/NiFloatInterpolator.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiFloatInterpolator();
 	NIFLIB_API ~NiFloatInterpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiFloatsExtraData.h b/include/obj/NiFloatsExtraData.h
index 952a89cf056da0d792a1ba9167651ec6e53160da..d0b6082c986ed85a673ce2f3b98dc546d99e57fb 100644
--- a/include/obj/NiFloatsExtraData.h
+++ b/include/obj/NiFloatsExtraData.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiFloatsExtraData();
 	NIFLIB_API ~NiFloatsExtraData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiFogProperty.h b/include/obj/NiFogProperty.h
index 3a73703f3cba6e86158bf057ee6e0ced41b43f1f..b6d26ea594b2f1c86d370665948fe07d38a0c20f 100644
--- a/include/obj/NiFogProperty.h
+++ b/include/obj/NiFogProperty.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiFogProperty();
 	NIFLIB_API ~NiFogProperty();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiGeomMorpherController.h b/include/obj/NiGeomMorpherController.h
index acb9335052449230f91ee84a202eaea7e9ab1159..2cad8ec08b9bd974e987fae46a4615804dc22ef1 100644
--- a/include/obj/NiGeomMorpherController.h
+++ b/include/obj/NiGeomMorpherController.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiGeomMorpherController();
 	NIFLIB_API ~NiGeomMorpherController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiGeometry.h b/include/obj/NiGeometry.h
index 85f8571798ed2921625ca7db4d69716da7b5b243..f1f77c939ff2b653f69e71bef2cba9ae0c8b7750 100644
--- a/include/obj/NiGeometry.h
+++ b/include/obj/NiGeometry.h
@@ -33,10 +33,7 @@ public:
 	NIFLIB_API NiGeometry();
 	NIFLIB_API ~NiGeometry();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiGeometryData.h b/include/obj/NiGeometryData.h
index aadd1a6e9c3bbf92126b37d9b40170b206a5c5f3..e18a6cc12ee87d18ca4bc8255ca87a99fe2b3314 100644
--- a/include/obj/NiGeometryData.h
+++ b/include/obj/NiGeometryData.h
@@ -31,10 +31,7 @@ public:
 	NIFLIB_API NiGeometryData();
 	NIFLIB_API ~NiGeometryData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiGravity.h b/include/obj/NiGravity.h
index dc7e2887a3b86410e8339e5d00d9595aec0f0a43..bec76a57bf43ca1468649bb5f9e962aabdd91c34 100644
--- a/include/obj/NiGravity.h
+++ b/include/obj/NiGravity.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiGravity();
 	NIFLIB_API ~NiGravity();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiImage.h b/include/obj/NiImage.h
index fff2826abfdebf7505e28a36c58d3534f6e01e31..641a21e57b5efcf7f7bc3f253dadf16c1a45041f 100644
--- a/include/obj/NiImage.h
+++ b/include/obj/NiImage.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiImage();
 	NIFLIB_API ~NiImage();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiIntegerExtraData.h b/include/obj/NiIntegerExtraData.h
index f96abc5d39392fdfbb04b2de22241fbf5c7c03a7..93932ae23163fa1b995759e338960d0263976aac 100644
--- a/include/obj/NiIntegerExtraData.h
+++ b/include/obj/NiIntegerExtraData.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiIntegerExtraData();
 	NIFLIB_API ~NiIntegerExtraData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiIntegersExtraData.h b/include/obj/NiIntegersExtraData.h
index c76c9138a33926486508c9623d5e5b8d0330385b..51421ecb1f9891dafd19dd3d02c86a148e0f6acf 100644
--- a/include/obj/NiIntegersExtraData.h
+++ b/include/obj/NiIntegersExtraData.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiIntegersExtraData();
 	NIFLIB_API ~NiIntegersExtraData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiInterpolator.h b/include/obj/NiInterpolator.h
index 58e5c83afa619553457b37382bc142ffbd81aa54..97259320170568ea6b659b3f7630b3b2f4f64eea 100644
--- a/include/obj/NiInterpolator.h
+++ b/include/obj/NiInterpolator.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiInterpolator();
 	NIFLIB_API ~NiInterpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiKeyframeController.h b/include/obj/NiKeyframeController.h
index ac1799f527a46bee2094d7865736f98f886a0375..2dfac325154cd0e72a5f4e48cc753bd1c1cdeb22 100644
--- a/include/obj/NiKeyframeController.h
+++ b/include/obj/NiKeyframeController.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiKeyframeController();
 	NIFLIB_API ~NiKeyframeController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiKeyframeData.h b/include/obj/NiKeyframeData.h
index 24ad1eeb0bdca29bc8e7c04e53eff297516382c8..f198f58e2373d75ee6f2cddbdfab31adbe9895fc 100644
--- a/include/obj/NiKeyframeData.h
+++ b/include/obj/NiKeyframeData.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiKeyframeData();
 	NIFLIB_API ~NiKeyframeData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiLODData.h b/include/obj/NiLODData.h
index 3bb3381cece5e01340c046d4f35f3142806407e3..349c94c4803bdb3e26e8fd12e90cb8d1d804d398 100644
--- a/include/obj/NiLODData.h
+++ b/include/obj/NiLODData.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiLODData();
 	NIFLIB_API ~NiLODData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiLODNode.h b/include/obj/NiLODNode.h
index 0930d12c1da708274c94169b7adfba09ccfe382b..47c559d0e4385d1355544158d3279055f81cb2ca 100644
--- a/include/obj/NiLODNode.h
+++ b/include/obj/NiLODNode.h
@@ -30,10 +30,7 @@ public:
 	NIFLIB_API NiLODNode();
 	NIFLIB_API ~NiLODNode();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiLight.h b/include/obj/NiLight.h
index 109abd2cc4d1ae4e6727e8e9aa12f1a09401ae04..dbbaa8d29246b8dbbb6c54d6584a0753efe82f10 100644
--- a/include/obj/NiLight.h
+++ b/include/obj/NiLight.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiLight();
 	NIFLIB_API ~NiLight();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiLightColorController.h b/include/obj/NiLightColorController.h
index 291a09d7e5f55a9ea61ca5209fc757bc72324df2..2544f8a08b12f1a0bc495593905be4dca5d410db 100644
--- a/include/obj/NiLightColorController.h
+++ b/include/obj/NiLightColorController.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiLightColorController();
 	NIFLIB_API ~NiLightColorController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiLightDimmerController.h b/include/obj/NiLightDimmerController.h
index 99a33bcb391890ff8d0bbb955ab90fe0b8569b4c..04d45aa01a1124e7d54cc4120f9316eccedbd351 100644
--- a/include/obj/NiLightDimmerController.h
+++ b/include/obj/NiLightDimmerController.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiLightDimmerController();
 	NIFLIB_API ~NiLightDimmerController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiLookAtController.h b/include/obj/NiLookAtController.h
index 0461f8fbf28b644d967ca922ea8cc4d13d4f90d6..4f8dae8685e0425ca5f225e602eb78e5bc5f39db 100644
--- a/include/obj/NiLookAtController.h
+++ b/include/obj/NiLookAtController.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiLookAtController();
 	NIFLIB_API ~NiLookAtController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiLookAtInterpolator.h b/include/obj/NiLookAtInterpolator.h
index 3f49e6c6ec092994b8ece54dcfd867a12b3f03be..e525e06ca49a97aeaa6060cddd0f7fb89ab14281 100644
--- a/include/obj/NiLookAtInterpolator.h
+++ b/include/obj/NiLookAtInterpolator.h
@@ -29,10 +29,7 @@ public:
 	NIFLIB_API NiLookAtInterpolator();
 	NIFLIB_API ~NiLookAtInterpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiMaterialColorController.h b/include/obj/NiMaterialColorController.h
index c25776f9f65f4bd75d5ff87e1135f6c3fdf39d24..2ca593b7d3c2631918c4f42f90d781477d259768 100644
--- a/include/obj/NiMaterialColorController.h
+++ b/include/obj/NiMaterialColorController.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiMaterialColorController();
 	NIFLIB_API ~NiMaterialColorController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiMaterialProperty.h b/include/obj/NiMaterialProperty.h
index 8dc2c93c7d68193da060cfcf7e8fd975c27a8211..96bb073cf9e15c21a7ca77bce5eea8537bcc5c88 100644
--- a/include/obj/NiMaterialProperty.h
+++ b/include/obj/NiMaterialProperty.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiMaterialProperty();
 	NIFLIB_API ~NiMaterialProperty();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiMeshPSysData.h b/include/obj/NiMeshPSysData.h
index fc5fb7c3c8dbd947462f2179b9efce5e6690ee2c..d97b4041f1e78f69c5e1ab4d81e47cf1bfd6f850 100644
--- a/include/obj/NiMeshPSysData.h
+++ b/include/obj/NiMeshPSysData.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiMeshPSysData();
 	NIFLIB_API ~NiMeshPSysData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiMeshParticleSystem.h b/include/obj/NiMeshParticleSystem.h
index 45620e43487908c62a7a8b00feb2025b35db6d48..bcc234d115e28db167a0162898a3613b3878e394 100644
--- a/include/obj/NiMeshParticleSystem.h
+++ b/include/obj/NiMeshParticleSystem.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiMeshParticleSystem();
 	NIFLIB_API ~NiMeshParticleSystem();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiMorphData.h b/include/obj/NiMorphData.h
index 66f71667a5484a6ac1795148919c640273988be8..cc95c43e710c5c5858e8090ff6575d1d2f8f0460 100644
--- a/include/obj/NiMorphData.h
+++ b/include/obj/NiMorphData.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiMorphData();
 	NIFLIB_API ~NiMorphData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiMultiTargetTransformController.h b/include/obj/NiMultiTargetTransformController.h
index 0fdf032e4c18bf132d5433619c3cb728bc5bef83..9689358c352a46a828c78e13ac8c78f7a9003735 100644
--- a/include/obj/NiMultiTargetTransformController.h
+++ b/include/obj/NiMultiTargetTransformController.h
@@ -25,10 +25,7 @@ public:
 	NIFLIB_API NiMultiTargetTransformController();
 	NIFLIB_API ~NiMultiTargetTransformController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiNode.h b/include/obj/NiNode.h
index 98bd9e1cc9b04b00508f788e634c0bf814e73c12..910e4cfd880b5e34316bf2022e9382184ae646dd 100644
--- a/include/obj/NiNode.h
+++ b/include/obj/NiNode.h
@@ -30,10 +30,7 @@ public:
 	NIFLIB_API NiNode();
 	NIFLIB_API ~NiNode();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiObject.h b/include/obj/NiObject.h
index d9311b1e546e107454f94b21b10645546a785ebb..51c6eb8aa640f9f164a9a09901ddb463aae28b6c 100644
--- a/include/obj/NiObject.h
+++ b/include/obj/NiObject.h
@@ -34,12 +34,6 @@ public:
 	/*! Destructor */
 	NIFLIB_API virtual ~NiObject();
 
-	/*!
-	 * Fetches Run Time Type Information Constant which can be used in type comparision operations.
-	 * \return The type constant that represents this type of object.  This is a static function and is not dependent on any particular instance of the object.
-	 */
-	NIFLIB_API static const Type & TypeConst();
-
 	/*!
 	 * Used to determine the type of a particular instance of this object.
 	 * \return The type constant for the actual type of the object.
@@ -135,8 +129,9 @@ public:
 	/*! NIFLIB_HIDDEN function.  For internal use only. */
 	NIFLIB_HIDDEN virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) {}
 
+	NIFLIB_API static const Type TYPE;
 private:
-	static const Type TYPE;
+	
 	mutable unsigned int _ref_count;
 	list<NiObject*> _cross_refs;
 	static unsigned int objectsInMemory;
@@ -164,7 +159,7 @@ template <class T> Ref<const T> StaticCast (const NiObject * object) {
 #endif
 
 template <class T> Ref<T> DynamicCast( NiObject * object ) {
-	if ( object && object->IsDerivedType(T::TypeConst()) ) {
+	if ( object && object->IsDerivedType(T::TYPE) ) {
 		return (T*)object;
 	} else {
 		return NULL;
@@ -174,7 +169,7 @@ template <class T> Ref<T> DynamicCast( NiObject * object ) {
 //SWIG doesn't want two versions of the same thing
 #ifndef SWIG
 template <class T> Ref<const T> DynamicCast( const NiObject * object ) {
-	if ( object && object->IsDerivedType(T::TypeConst()) ) {
+	if ( object && object->IsDerivedType(T::TYPE) ) {
 		return (const T*)object;
 	} else {
 		return NULL;
diff --git a/include/obj/NiObjectNET.h b/include/obj/NiObjectNET.h
index 9db6eb51649f89b6d5166b2148cb4190fb2b1e2c..e06dd403be39e97e0586c4d07591d1563ce6e372 100644
--- a/include/obj/NiObjectNET.h
+++ b/include/obj/NiObjectNET.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiObjectNET();
 	NIFLIB_API ~NiObjectNET();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysAgeDeathModifier.h b/include/obj/NiPSysAgeDeathModifier.h
index 9c5cc75d82ccd3087a934e02b994a85835b03b03..e604f686b4df710aff2e99f6c8a09629aa78b6a4 100644
--- a/include/obj/NiPSysAgeDeathModifier.h
+++ b/include/obj/NiPSysAgeDeathModifier.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiPSysAgeDeathModifier();
 	NIFLIB_API ~NiPSysAgeDeathModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysBombModifier.h b/include/obj/NiPSysBombModifier.h
index 31aca5d950e5a514e49027e96c0be8599737b24a..0784f2b53c15585efbe251d68f5d70cc0ec15e0e 100644
--- a/include/obj/NiPSysBombModifier.h
+++ b/include/obj/NiPSysBombModifier.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API NiPSysBombModifier();
 	NIFLIB_API ~NiPSysBombModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysBoundUpdateModifier.h b/include/obj/NiPSysBoundUpdateModifier.h
index 56723f341e522d8d48aa0a86ead0aa7119692014..91e67eb4eed0a3a8db1665e0fe2529f5108f18b6 100644
--- a/include/obj/NiPSysBoundUpdateModifier.h
+++ b/include/obj/NiPSysBoundUpdateModifier.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPSysBoundUpdateModifier();
 	NIFLIB_API ~NiPSysBoundUpdateModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysBoxEmitter.h b/include/obj/NiPSysBoxEmitter.h
index 322baf140d5226b2519235b3d4b55b25e5c3bb9e..3858e39dcb83536c8de82ba05633f59d036b963d 100644
--- a/include/obj/NiPSysBoxEmitter.h
+++ b/include/obj/NiPSysBoxEmitter.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPSysBoxEmitter();
 	NIFLIB_API ~NiPSysBoxEmitter();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysColliderManager.h b/include/obj/NiPSysColliderManager.h
index c7210acf32478bbf74430b2857cdf27b449806ce..61b95d1c9c5e14617c34c19b47a2f1150ee3bb0d 100644
--- a/include/obj/NiPSysColliderManager.h
+++ b/include/obj/NiPSysColliderManager.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiPSysColliderManager();
 	NIFLIB_API ~NiPSysColliderManager();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysColorModifier.h b/include/obj/NiPSysColorModifier.h
index 33615427ef861f3b2b3f7ac4c0ef621a6424c9ab..6ca73a1bd829538da94b1677bdaf0fa325a79871 100644
--- a/include/obj/NiPSysColorModifier.h
+++ b/include/obj/NiPSysColorModifier.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiPSysColorModifier();
 	NIFLIB_API ~NiPSysColorModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysCylinderEmitter.h b/include/obj/NiPSysCylinderEmitter.h
index d58aeedc78917f24ef87db67049ce6ba3df52157..c3f2c5c34b15acc8ad3fe94d15586eea960a19de 100644
--- a/include/obj/NiPSysCylinderEmitter.h
+++ b/include/obj/NiPSysCylinderEmitter.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPSysCylinderEmitter();
 	NIFLIB_API ~NiPSysCylinderEmitter();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysData.h b/include/obj/NiPSysData.h
index 96489fe04582adc0301425edef8ed6a7d604261a..8621b1dc6c2b1234c971427f9d96faff0eb25ed5 100644
--- a/include/obj/NiPSysData.h
+++ b/include/obj/NiPSysData.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiPSysData();
 	NIFLIB_API ~NiPSysData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysDragModifier.h b/include/obj/NiPSysDragModifier.h
index c1e42dfa0b642d698c4249136df1d1d68666bb77..10cf987f5cef0e8180ac55162d870d6bb9586d79 100644
--- a/include/obj/NiPSysDragModifier.h
+++ b/include/obj/NiPSysDragModifier.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API NiPSysDragModifier();
 	NIFLIB_API ~NiPSysDragModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysEmitter.h b/include/obj/NiPSysEmitter.h
index 5b945e9d4803e6fe9d443eb2ca40756eb4b4e982..91614700f08b61d9fa84b5810e0892667cb00a83 100644
--- a/include/obj/NiPSysEmitter.h
+++ b/include/obj/NiPSysEmitter.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPSysEmitter();
 	NIFLIB_API ~NiPSysEmitter();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysEmitterCtlr.h b/include/obj/NiPSysEmitterCtlr.h
index 5260804f77b98cc434837184a456716c20fc932e..cb74e99c8b6030d420466547714b420354ad7c6c 100644
--- a/include/obj/NiPSysEmitterCtlr.h
+++ b/include/obj/NiPSysEmitterCtlr.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiPSysEmitterCtlr();
 	NIFLIB_API ~NiPSysEmitterCtlr();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysEmitterCtlrData.h b/include/obj/NiPSysEmitterCtlrData.h
index c943d29b408a911eb3686b384f68f8f161cdc1e0..ec7c66d03b92e615f4b9c3f1645c8ea356106e16 100644
--- a/include/obj/NiPSysEmitterCtlrData.h
+++ b/include/obj/NiPSysEmitterCtlrData.h
@@ -25,10 +25,7 @@ public:
 	NIFLIB_API NiPSysEmitterCtlrData();
 	NIFLIB_API ~NiPSysEmitterCtlrData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysEmitterDeclinationCtlr.h b/include/obj/NiPSysEmitterDeclinationCtlr.h
index c5fa2169725fdfc57d45e48a6aa671db4693ccbe..2b8111118048c962de97a33068e436e9d3869b40 100644
--- a/include/obj/NiPSysEmitterDeclinationCtlr.h
+++ b/include/obj/NiPSysEmitterDeclinationCtlr.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPSysEmitterDeclinationCtlr();
 	NIFLIB_API ~NiPSysEmitterDeclinationCtlr();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysEmitterDeclinationVarCtlr.h b/include/obj/NiPSysEmitterDeclinationVarCtlr.h
index 89e5947ab48e63a7ddac4fb64fc2c7e23f089263..6b6729a71dc2e9fde214b94e30c96121b5da5f7e 100644
--- a/include/obj/NiPSysEmitterDeclinationVarCtlr.h
+++ b/include/obj/NiPSysEmitterDeclinationVarCtlr.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPSysEmitterDeclinationVarCtlr();
 	NIFLIB_API ~NiPSysEmitterDeclinationVarCtlr();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysEmitterInitialRadiusCtlr.h b/include/obj/NiPSysEmitterInitialRadiusCtlr.h
index 11d6ced2426629648c65039e25a18836fd12cbab..e567d29b6c2f04efa245d800e46680ab04dcabcd 100644
--- a/include/obj/NiPSysEmitterInitialRadiusCtlr.h
+++ b/include/obj/NiPSysEmitterInitialRadiusCtlr.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPSysEmitterInitialRadiusCtlr();
 	NIFLIB_API ~NiPSysEmitterInitialRadiusCtlr();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysEmitterLifeSpanCtlr.h b/include/obj/NiPSysEmitterLifeSpanCtlr.h
index c787b62762ca5e154f96e642531b49f0003f8e90..01f54fc597409b41b2ada9db5b5757ee95e8da75 100644
--- a/include/obj/NiPSysEmitterLifeSpanCtlr.h
+++ b/include/obj/NiPSysEmitterLifeSpanCtlr.h
@@ -25,10 +25,7 @@ public:
 	NIFLIB_API NiPSysEmitterLifeSpanCtlr();
 	NIFLIB_API ~NiPSysEmitterLifeSpanCtlr();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysEmitterSpeedCtlr.h b/include/obj/NiPSysEmitterSpeedCtlr.h
index be5ab9debdf309e67a512d9aa302b83a2be23c8a..8578233c52d05126bf69565cc9b3dbc6cfac82cb 100644
--- a/include/obj/NiPSysEmitterSpeedCtlr.h
+++ b/include/obj/NiPSysEmitterSpeedCtlr.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API NiPSysEmitterSpeedCtlr();
 	NIFLIB_API ~NiPSysEmitterSpeedCtlr();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysGravityModifier.h b/include/obj/NiPSysGravityModifier.h
index 79794fb18ce7b3b258edf00013c85a8f01881c4c..e590eb08a62529251ac0f0eba72943b634063365 100644
--- a/include/obj/NiPSysGravityModifier.h
+++ b/include/obj/NiPSysGravityModifier.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API NiPSysGravityModifier();
 	NIFLIB_API ~NiPSysGravityModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysGravityStrengthCtlr.h b/include/obj/NiPSysGravityStrengthCtlr.h
index beffe909020492647e6afb8a93ebbbb500135a4d..6ea0d1474a69c4ed1ca37125a3ea96f4e588ab36 100644
--- a/include/obj/NiPSysGravityStrengthCtlr.h
+++ b/include/obj/NiPSysGravityStrengthCtlr.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API NiPSysGravityStrengthCtlr();
 	NIFLIB_API ~NiPSysGravityStrengthCtlr();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysGrowFadeModifier.h b/include/obj/NiPSysGrowFadeModifier.h
index a4c930d8cf04beec6c3869afaec6995d7733730c..970a0f2b1c338013d16106f5dec9ce29efc6ab4a 100644
--- a/include/obj/NiPSysGrowFadeModifier.h
+++ b/include/obj/NiPSysGrowFadeModifier.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPSysGrowFadeModifier();
 	NIFLIB_API ~NiPSysGrowFadeModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysMeshEmitter.h b/include/obj/NiPSysMeshEmitter.h
index 0c8f72b2f68a535640a3af7fab796adc4bffef8e..a6facb020f421579d6a6f23229aa2408ae2f9c96 100644
--- a/include/obj/NiPSysMeshEmitter.h
+++ b/include/obj/NiPSysMeshEmitter.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiPSysMeshEmitter();
 	NIFLIB_API ~NiPSysMeshEmitter();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysMeshUpdateModifier.h b/include/obj/NiPSysMeshUpdateModifier.h
index 6a69d23c51ed9ff47691eaf094ebdc87303f6357..e70660ac7d6609b572bb14b84a74d072d5c3fe49 100644
--- a/include/obj/NiPSysMeshUpdateModifier.h
+++ b/include/obj/NiPSysMeshUpdateModifier.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiPSysMeshUpdateModifier();
 	NIFLIB_API ~NiPSysMeshUpdateModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysModifier.h b/include/obj/NiPSysModifier.h
index af8770c162e46d69924d15f3c73b2ff5ea3c3cd4..f82b1ddca12f7d3619eb687f7cf78fe6dec2d37e 100644
--- a/include/obj/NiPSysModifier.h
+++ b/include/obj/NiPSysModifier.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API NiPSysModifier();
 	NIFLIB_API ~NiPSysModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysModifierActiveCtlr.h b/include/obj/NiPSysModifierActiveCtlr.h
index a0749ad7d0fe5288807c26f5e7488120c6b9b65f..de7a623bffd28c2caf1292e5b5cf08c6d6a63421 100644
--- a/include/obj/NiPSysModifierActiveCtlr.h
+++ b/include/obj/NiPSysModifierActiveCtlr.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPSysModifierActiveCtlr();
 	NIFLIB_API ~NiPSysModifierActiveCtlr();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysPlanarCollider.h b/include/obj/NiPSysPlanarCollider.h
index fecc5bc51b5caa1f73a4e10f6a9c203feb7ec8ae..3a24aef791e5c344ad4f681db7ff30541b5e3fcf 100644
--- a/include/obj/NiPSysPlanarCollider.h
+++ b/include/obj/NiPSysPlanarCollider.h
@@ -29,10 +29,7 @@ public:
 	NIFLIB_API NiPSysPlanarCollider();
 	NIFLIB_API ~NiPSysPlanarCollider();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysPositionModifier.h b/include/obj/NiPSysPositionModifier.h
index 9c02f193da8c380d6c063102fda5e168e14e60c6..ce5e0490437079cc4fe534e3e16f33bfd60a7b75 100644
--- a/include/obj/NiPSysPositionModifier.h
+++ b/include/obj/NiPSysPositionModifier.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiPSysPositionModifier();
 	NIFLIB_API ~NiPSysPositionModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysResetOnLoopCtlr.h b/include/obj/NiPSysResetOnLoopCtlr.h
index c331bfd0aea253cc86e1af1fd8913c421289aa52..a063da9eb381e9b556999fed2179eaefc454c576 100644
--- a/include/obj/NiPSysResetOnLoopCtlr.h
+++ b/include/obj/NiPSysResetOnLoopCtlr.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPSysResetOnLoopCtlr();
 	NIFLIB_API ~NiPSysResetOnLoopCtlr();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysRotationModifier.h b/include/obj/NiPSysRotationModifier.h
index 0c3ba6ca2b1efb746cd9050fc43c33969d9f280c..0e1f744932a03387f079dd3fc4a08d0f01f6713d 100644
--- a/include/obj/NiPSysRotationModifier.h
+++ b/include/obj/NiPSysRotationModifier.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPSysRotationModifier();
 	NIFLIB_API ~NiPSysRotationModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysSpawnModifier.h b/include/obj/NiPSysSpawnModifier.h
index dfd7b70795d439d056844b674e15f610a061a871..699b3f3b888d6db8a22e52a26ed01110a22efc02 100644
--- a/include/obj/NiPSysSpawnModifier.h
+++ b/include/obj/NiPSysSpawnModifier.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPSysSpawnModifier();
 	NIFLIB_API ~NiPSysSpawnModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysSphereEmitter.h b/include/obj/NiPSysSphereEmitter.h
index 43a0fe7706b8fb833817d53eac0862e2d142fb30..084d280d9edbacd118c0b5f345316b1b40a3437e 100644
--- a/include/obj/NiPSysSphereEmitter.h
+++ b/include/obj/NiPSysSphereEmitter.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPSysSphereEmitter();
 	NIFLIB_API ~NiPSysSphereEmitter();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysUpdateCtlr.h b/include/obj/NiPSysUpdateCtlr.h
index 7e9995f41b38be185b0db07c805aaaa03524af6c..33bc64cedb8e37d973985ca82d40ba28e8e45025 100644
--- a/include/obj/NiPSysUpdateCtlr.h
+++ b/include/obj/NiPSysUpdateCtlr.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPSysUpdateCtlr();
 	NIFLIB_API ~NiPSysUpdateCtlr();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPSysVolumeEmitter.h b/include/obj/NiPSysVolumeEmitter.h
index 31e5f18e6af843dbe8796f0083bfb86743427617..823848a8bb46cec7cb0ba54e73bf5a1e1411b7b8 100644
--- a/include/obj/NiPSysVolumeEmitter.h
+++ b/include/obj/NiPSysVolumeEmitter.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API NiPSysVolumeEmitter();
 	NIFLIB_API ~NiPSysVolumeEmitter();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPalette.h b/include/obj/NiPalette.h
index e4ad0c255f5cf2897dc482b742878a92effe7029..e03513273051dc03e17de900e1ffd05bf3819050 100644
--- a/include/obj/NiPalette.h
+++ b/include/obj/NiPalette.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiPalette();
 	NIFLIB_API ~NiPalette();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiParticleBomb.h b/include/obj/NiParticleBomb.h
index a78d396c199504193de59a274f3208f0bbc3859e..df1c2827d45d0d88b6f232106acd645fdbf007c5 100644
--- a/include/obj/NiParticleBomb.h
+++ b/include/obj/NiParticleBomb.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiParticleBomb();
 	NIFLIB_API ~NiParticleBomb();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiParticleColorModifier.h b/include/obj/NiParticleColorModifier.h
index 4308f5729775bec54f224dcd8723a5e0f94263df..19d53eb9cc698db3251118a765d20b058f32ddb9 100644
--- a/include/obj/NiParticleColorModifier.h
+++ b/include/obj/NiParticleColorModifier.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiParticleColorModifier();
 	NIFLIB_API ~NiParticleColorModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiParticleGrowFade.h b/include/obj/NiParticleGrowFade.h
index 4468e835a038cc3c236ddadbb894ef6e7c7240d5..ff61ff6ae7e9b5ceef01373946d46e73b7209354 100644
--- a/include/obj/NiParticleGrowFade.h
+++ b/include/obj/NiParticleGrowFade.h
@@ -25,10 +25,7 @@ public:
 	NIFLIB_API NiParticleGrowFade();
 	NIFLIB_API ~NiParticleGrowFade();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiParticleMeshModifier.h b/include/obj/NiParticleMeshModifier.h
index d04d97fa5b39c96ee6d0cb2d24fd6c34cad4dd28..5c6cbfd8777457f9563f398c93ed41b04ad05fed 100644
--- a/include/obj/NiParticleMeshModifier.h
+++ b/include/obj/NiParticleMeshModifier.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiParticleMeshModifier();
 	NIFLIB_API ~NiParticleMeshModifier();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiParticleMeshes.h b/include/obj/NiParticleMeshes.h
index d85a94cc6fe5cbda186b271882bb3849ed558056..8df655042c8e0707f205df4ddd5675145131c623 100644
--- a/include/obj/NiParticleMeshes.h
+++ b/include/obj/NiParticleMeshes.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiParticleMeshes();
 	NIFLIB_API ~NiParticleMeshes();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiParticleMeshesData.h b/include/obj/NiParticleMeshesData.h
index 2c1971143fb6d40e30cf4c8c6a16826e46835e95..defe206b3124d2ccb2aecbea57de8f5e92eb8ae5 100644
--- a/include/obj/NiParticleMeshesData.h
+++ b/include/obj/NiParticleMeshesData.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiParticleMeshesData();
 	NIFLIB_API ~NiParticleMeshesData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiParticleRotation.h b/include/obj/NiParticleRotation.h
index 842c049583da8dc74f3881a06a9a7270422288ff..f9a400fec57974790c31edfa3214104f8712ad14 100644
--- a/include/obj/NiParticleRotation.h
+++ b/include/obj/NiParticleRotation.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiParticleRotation();
 	NIFLIB_API ~NiParticleRotation();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiParticleSystem.h b/include/obj/NiParticleSystem.h
index 08b380360060e5a2b9a7485bf58c36f656bbf803..9332a7c25ee11afea10e2eb998ab1ed9a147fa71 100644
--- a/include/obj/NiParticleSystem.h
+++ b/include/obj/NiParticleSystem.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiParticleSystem();
 	NIFLIB_API ~NiParticleSystem();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiParticleSystemController.h b/include/obj/NiParticleSystemController.h
index 6afa764418f06aeedcaa56dddd4f0f9e3024c435..a02c2ed26f56b7e4a35992221d7a2ef2cdc9a3b8 100644
--- a/include/obj/NiParticleSystemController.h
+++ b/include/obj/NiParticleSystemController.h
@@ -30,10 +30,7 @@ public:
 	NIFLIB_API NiParticleSystemController();
 	NIFLIB_API ~NiParticleSystemController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiParticles.h b/include/obj/NiParticles.h
index 72c0d0f7e5940e656e8b04750e8308de62c8c7d0..08cfef00faca7b3b902b4bfe5acebf3ee9b344ff 100644
--- a/include/obj/NiParticles.h
+++ b/include/obj/NiParticles.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiParticles();
 	NIFLIB_API ~NiParticles();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiParticlesData.h b/include/obj/NiParticlesData.h
index 28889f817677f5ec9e6ea6f3f8566a50993c7ad5..e3b002d596d66f38c791adb8b691ca2f17c6bfc6 100644
--- a/include/obj/NiParticlesData.h
+++ b/include/obj/NiParticlesData.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiParticlesData();
 	NIFLIB_API ~NiParticlesData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPathController.h b/include/obj/NiPathController.h
index 776f8d7f7f8b376be4233f33d0d8c2b7181b6725..2cf97588f4dda1153659ab9cf3b0cc5ae4814fcd 100644
--- a/include/obj/NiPathController.h
+++ b/include/obj/NiPathController.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiPathController();
 	NIFLIB_API ~NiPathController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPathInterpolator.h b/include/obj/NiPathInterpolator.h
index 57b2b7ecfbd5af23e75026f39fa042cf35463f0d..0aedd3a8a7eb363cd1e1304c3af5ca3c480ee981 100644
--- a/include/obj/NiPathInterpolator.h
+++ b/include/obj/NiPathInterpolator.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiPathInterpolator();
 	NIFLIB_API ~NiPathInterpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPixelData.h b/include/obj/NiPixelData.h
index e1b1c796e0b29490e51bfcac61740f06afb0cf0e..d323760e36017fc3500fed54a2c0a84415eb0514 100644
--- a/include/obj/NiPixelData.h
+++ b/include/obj/NiPixelData.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiPixelData();
 	NIFLIB_API ~NiPixelData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPlanarCollider.h b/include/obj/NiPlanarCollider.h
index a2e0d24495dff77ec2678ab976f26cd8cd133aa6..baf35fb404840064a7d77fadca2db7fe38fc5348 100644
--- a/include/obj/NiPlanarCollider.h
+++ b/include/obj/NiPlanarCollider.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiPlanarCollider();
 	NIFLIB_API ~NiPlanarCollider();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPoint3Interpolator.h b/include/obj/NiPoint3Interpolator.h
index 9bdde06dcf6c3427b9d4803bf2dde6a112ed6018..dfc9b5fc5b9f5d7381be712f39da4969bfeaf30c 100644
--- a/include/obj/NiPoint3Interpolator.h
+++ b/include/obj/NiPoint3Interpolator.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiPoint3Interpolator();
 	NIFLIB_API ~NiPoint3Interpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPointLight.h b/include/obj/NiPointLight.h
index 8fdc2c17c83e3e61a72c9123d1994466d58f5bd6..181f54b5166a3bcfe0d25bf6b9d6414e3e26b389 100644
--- a/include/obj/NiPointLight.h
+++ b/include/obj/NiPointLight.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiPointLight();
 	NIFLIB_API ~NiPointLight();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiPosData.h b/include/obj/NiPosData.h
index eaf4acffe6acdff5ab9094c49b0a8ed191da429b..b800ee8d5a640be5c71102e963008b0d8c08fddb 100644
--- a/include/obj/NiPosData.h
+++ b/include/obj/NiPosData.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiPosData();
 	NIFLIB_API ~NiPosData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiProperty.h b/include/obj/NiProperty.h
index 29012bf894c5bc5f5cb8105511a1666f499c5dab..6f42d0688ed13aa03e761e871964899867ff8b30 100644
--- a/include/obj/NiProperty.h
+++ b/include/obj/NiProperty.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiProperty();
 	NIFLIB_API ~NiProperty();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiRangeLODData.h b/include/obj/NiRangeLODData.h
index 2e39f382bd6cba81d1bf27639af6c5c54152cc80..238eca14c57693a16b5b40a1baa5e38bbb2db7f0 100644
--- a/include/obj/NiRangeLODData.h
+++ b/include/obj/NiRangeLODData.h
@@ -26,10 +26,7 @@ public:
 	NIFLIB_API NiRangeLODData();
 	NIFLIB_API ~NiRangeLODData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiRotatingParticles.h b/include/obj/NiRotatingParticles.h
index ab8a32404f5e12d8f1a122ecec8fdcd0b7e0a3e8..63cf99d5732db662497155663e47ef423b42a3ba 100644
--- a/include/obj/NiRotatingParticles.h
+++ b/include/obj/NiRotatingParticles.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiRotatingParticles();
 	NIFLIB_API ~NiRotatingParticles();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiRotatingParticlesData.h b/include/obj/NiRotatingParticlesData.h
index 52689a61d1da1441f6e081f45799dac78684615e..e8dd55763dd06d9c9bcb2e50250d83595403d2fb 100644
--- a/include/obj/NiRotatingParticlesData.h
+++ b/include/obj/NiRotatingParticlesData.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiRotatingParticlesData();
 	NIFLIB_API ~NiRotatingParticlesData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiScreenLODData.h b/include/obj/NiScreenLODData.h
index 3b92ce8bf6e38b464d697f985023f589c411b3d1..b58fc7a353be19f5e7d5753ec03e8be84b63e7c2 100644
--- a/include/obj/NiScreenLODData.h
+++ b/include/obj/NiScreenLODData.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiScreenLODData();
 	NIFLIB_API ~NiScreenLODData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiSequenceStreamHelper.h b/include/obj/NiSequenceStreamHelper.h
index f41a39e16b5f7e8a4fe4a36380662a216b1b2e77..e0a2d8bbd8b48899aee6c331634afe957bce49e9 100644
--- a/include/obj/NiSequenceStreamHelper.h
+++ b/include/obj/NiSequenceStreamHelper.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiSequenceStreamHelper();
 	NIFLIB_API ~NiSequenceStreamHelper();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiShadeProperty.h b/include/obj/NiShadeProperty.h
index 4c2e83c37f62372ef4c56087499a4f59ef743dc2..5ee61161ec7b6834af47070e52a594f076b6d0ec 100644
--- a/include/obj/NiShadeProperty.h
+++ b/include/obj/NiShadeProperty.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiShadeProperty();
 	NIFLIB_API ~NiShadeProperty();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiSingleInterpolatorController.h b/include/obj/NiSingleInterpolatorController.h
index 1e1e440e8ee220d6e7f8b235d819c71875436e86..7a99f2c778a623dfea0207c52aba5c7bfb70a9bd 100644
--- a/include/obj/NiSingleInterpolatorController.h
+++ b/include/obj/NiSingleInterpolatorController.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiSingleInterpolatorController();
 	NIFLIB_API ~NiSingleInterpolatorController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiSkinData.h b/include/obj/NiSkinData.h
index e26ba1cff8ce87e6b00d2bb823fa240a16aa0c70..8d3ecff2bf52a60c55bdaf0068fcdbe6459aceba 100644
--- a/include/obj/NiSkinData.h
+++ b/include/obj/NiSkinData.h
@@ -36,10 +36,7 @@ public:
 	NIFLIB_API ~NiSkinData();
 
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiSkinInstance.h b/include/obj/NiSkinInstance.h
index b0355b6c714d43fa013cd9cf4b71373f55aca2fb..c46927b6a54c9a5be61a08b27cfed9322365e791 100644
--- a/include/obj/NiSkinInstance.h
+++ b/include/obj/NiSkinInstance.h
@@ -38,10 +38,7 @@ public:
 
 	NIFLIB_API ~NiSkinInstance();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiSkinPartition.h b/include/obj/NiSkinPartition.h
index ae18808a0674043b18e1c5c8df0782ec0198c0a3..201e07886cf90d78e228eeccca6819964e7daf7b 100644
--- a/include/obj/NiSkinPartition.h
+++ b/include/obj/NiSkinPartition.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiSkinPartition();
 	NIFLIB_API ~NiSkinPartition();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiSourceTexture.h b/include/obj/NiSourceTexture.h
index d0feb00781d3e7859b477df8ef465d135abe850f..1581fd0c38d064fe2fdd62ae964efc99b772a1a0 100644
--- a/include/obj/NiSourceTexture.h
+++ b/include/obj/NiSourceTexture.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API NiSourceTexture();
 	NIFLIB_API ~NiSourceTexture();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiSpecularProperty.h b/include/obj/NiSpecularProperty.h
index 2cea539a3d62d5f22df11bbb375fee056bc31134..2795333dc81654d26b9527829dba2186e190441b 100644
--- a/include/obj/NiSpecularProperty.h
+++ b/include/obj/NiSpecularProperty.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiSpecularProperty();
 	NIFLIB_API ~NiSpecularProperty();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiSphericalCollider.h b/include/obj/NiSphericalCollider.h
index 763317c1f01179123e4eeebaf8280f64a970ec66..50416284a5bd17bbb8ce0139b18c5a9c4fea604a 100644
--- a/include/obj/NiSphericalCollider.h
+++ b/include/obj/NiSphericalCollider.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiSphericalCollider();
 	NIFLIB_API ~NiSphericalCollider();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiSpotLight.h b/include/obj/NiSpotLight.h
index ad37962782add82eaa533d71bb51444f80d16f43..cf7e1cab9fa600acbb36af731d4f026b45156e87 100644
--- a/include/obj/NiSpotLight.h
+++ b/include/obj/NiSpotLight.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiSpotLight();
 	NIFLIB_API ~NiSpotLight();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiStencilProperty.h b/include/obj/NiStencilProperty.h
index 28a159a019d2b1ab1201cbe8ffac1418b07e45ed..713f5ec1635ef6aa07678efa6daa7c773a9a2656 100644
--- a/include/obj/NiStencilProperty.h
+++ b/include/obj/NiStencilProperty.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiStencilProperty();
 	NIFLIB_API ~NiStencilProperty();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiStringExtraData.h b/include/obj/NiStringExtraData.h
index 41c430b2997eb9ddd899fbd65810b1fb7c864d5f..e44a0800b26955d23fd0a48e1e946779ec659837 100644
--- a/include/obj/NiStringExtraData.h
+++ b/include/obj/NiStringExtraData.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API NiStringExtraData();
 	NIFLIB_API ~NiStringExtraData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiStringPalette.h b/include/obj/NiStringPalette.h
index 41ef592e52144529419eda7c6156e2e684aec9d1..608f30dacb2d7df7f8cb24e2966082fb986bcc57 100644
--- a/include/obj/NiStringPalette.h
+++ b/include/obj/NiStringPalette.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiStringPalette();
 	NIFLIB_API ~NiStringPalette();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiStringsExtraData.h b/include/obj/NiStringsExtraData.h
index 9092e5673a4c360563a2a4906b315bf7a5b889ad..6ea62a3e817709972ecc22e9d4514bb55226ceea 100644
--- a/include/obj/NiStringsExtraData.h
+++ b/include/obj/NiStringsExtraData.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiStringsExtraData();
 	NIFLIB_API ~NiStringsExtraData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTextKeyExtraData.h b/include/obj/NiTextKeyExtraData.h
index ba61095f25625ffac9cbd90acdf64a60e7c63b70..4d693baffdc81dee155c4913a7d6a641bd05d764 100644
--- a/include/obj/NiTextKeyExtraData.h
+++ b/include/obj/NiTextKeyExtraData.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiTextKeyExtraData();
 	NIFLIB_API ~NiTextKeyExtraData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTextureEffect.h b/include/obj/NiTextureEffect.h
index 08e071123a6cb07ae31129cc4af77eade0ddc314..019e4acbe7ef71e120c8c623b366c3889b7764ea 100644
--- a/include/obj/NiTextureEffect.h
+++ b/include/obj/NiTextureEffect.h
@@ -30,10 +30,7 @@ public:
 	NIFLIB_API NiTextureEffect();
 	NIFLIB_API ~NiTextureEffect();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTextureModeProperty.h b/include/obj/NiTextureModeProperty.h
index 655622e1e0901a8b60ba2a4f7900adc813715c15..161d5938efceefa0caebbc130e2eb1505359d5cc 100644
--- a/include/obj/NiTextureModeProperty.h
+++ b/include/obj/NiTextureModeProperty.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiTextureModeProperty();
 	NIFLIB_API ~NiTextureModeProperty();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTextureProperty.h b/include/obj/NiTextureProperty.h
index 76fd82ed600b4af31dbce5b786e76cd42198e0e0..20b6c475d1264e83c02803a3f2339a8dadbe7337 100644
--- a/include/obj/NiTextureProperty.h
+++ b/include/obj/NiTextureProperty.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiTextureProperty();
 	NIFLIB_API ~NiTextureProperty();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTextureTransformController.h b/include/obj/NiTextureTransformController.h
index 486faadf158a228e695a379f99457e37e463ddcb..eaa73d4db0b72161b34f24e13b72bc0dcce9a140 100644
--- a/include/obj/NiTextureTransformController.h
+++ b/include/obj/NiTextureTransformController.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiTextureTransformController();
 	NIFLIB_API ~NiTextureTransformController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTexturingProperty.h b/include/obj/NiTexturingProperty.h
index 64f99b4f46cd43dd84277ddd854cf544a42cc298..74cb5a19c41dc73870f9f25eb954b925b1e8969d 100644
--- a/include/obj/NiTexturingProperty.h
+++ b/include/obj/NiTexturingProperty.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API NiTexturingProperty();
 	NIFLIB_API ~NiTexturingProperty();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTimeController.h b/include/obj/NiTimeController.h
index 55ed84e04d0d52f9a02025d410625041c1b284a9..711794df330d09d6876509dfff94a2a39c9152aa 100644
--- a/include/obj/NiTimeController.h
+++ b/include/obj/NiTimeController.h
@@ -26,10 +26,7 @@ public:
 	NIFLIB_API NiTimeController();
 	NIFLIB_API ~NiTimeController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTransformController.h b/include/obj/NiTransformController.h
index 5a0a1c74cdd3ec8c1affd9a8f297f9c7fdf5aaab..1c0be2c41cf221a7a3087a12ccf628a9862ba1f2 100644
--- a/include/obj/NiTransformController.h
+++ b/include/obj/NiTransformController.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiTransformController();
 	NIFLIB_API ~NiTransformController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTransformData.h b/include/obj/NiTransformData.h
index 94f2dcb25501191dbb24d4e0ae341bd97739f181..2b0e1f0d585c21dfb9dfdfc1bcc8921e6e4e5bbc 100644
--- a/include/obj/NiTransformData.h
+++ b/include/obj/NiTransformData.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiTransformData();
 	NIFLIB_API ~NiTransformData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTransformInterpolator.h b/include/obj/NiTransformInterpolator.h
index 2bb8d78e0b560f02fb724750a1bfee11d4741cf2..0e93ad3fc6875eddae9089cee3eea82f17163eb1 100644
--- a/include/obj/NiTransformInterpolator.h
+++ b/include/obj/NiTransformInterpolator.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiTransformInterpolator();
 	NIFLIB_API ~NiTransformInterpolator();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTriBasedGeom.h b/include/obj/NiTriBasedGeom.h
index bdbf292ef989af765f081673999740daf47f5240..13d1a6982e10853969b4774b55668114f0de2646 100644
--- a/include/obj/NiTriBasedGeom.h
+++ b/include/obj/NiTriBasedGeom.h
@@ -26,10 +26,7 @@ public:
 	NIFLIB_API NiTriBasedGeom();
 	NIFLIB_API ~NiTriBasedGeom();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTriBasedGeomData.h b/include/obj/NiTriBasedGeomData.h
index 930cefd4a4b0b41f67753d9aa8876c2a3af49334..269499b39af7ca91cc5762e732600a45d93e7266 100644
--- a/include/obj/NiTriBasedGeomData.h
+++ b/include/obj/NiTriBasedGeomData.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiTriBasedGeomData();
 	NIFLIB_API ~NiTriBasedGeomData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTriShape.h b/include/obj/NiTriShape.h
index fb5ed0f93f9dc50aac6cbef57cba5ba32972d6f5..9da6d1cbd1c761ca06152099dfba5e15373dab74 100644
--- a/include/obj/NiTriShape.h
+++ b/include/obj/NiTriShape.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiTriShape();
 	NIFLIB_API ~NiTriShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTriShapeData.h b/include/obj/NiTriShapeData.h
index 3bdc0800645aa29eb223b5d40679f7a18a2598c9..9c3f43ab8d4cf30553f1c17ae867101192bed3c2 100644
--- a/include/obj/NiTriShapeData.h
+++ b/include/obj/NiTriShapeData.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiTriShapeData();
 	NIFLIB_API ~NiTriShapeData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTriStrips.h b/include/obj/NiTriStrips.h
index e3d71f47b69e1006bab50bfa75de89ea92613158..21be4b118a4ac25913ccb77bcb68b3c323ddbbdf 100644
--- a/include/obj/NiTriStrips.h
+++ b/include/obj/NiTriStrips.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiTriStrips();
 	NIFLIB_API ~NiTriStrips();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiTriStripsData.h b/include/obj/NiTriStripsData.h
index 200db2bbc1a14d511b47e7ba8cafe1e71d57a4ba..5a47319af2ef2686121cb538452b33e37bd1a03d 100644
--- a/include/obj/NiTriStripsData.h
+++ b/include/obj/NiTriStripsData.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API NiTriStripsData();
 	NIFLIB_API ~NiTriStripsData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:	
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiUVController.h b/include/obj/NiUVController.h
index 8d4a8a3313eb92a49d6a1612685fda4064e6ac43..88cd2e83279f78ab836f62f0539e403c79f9d39f 100644
--- a/include/obj/NiUVController.h
+++ b/include/obj/NiUVController.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiUVController();
 	NIFLIB_API ~NiUVController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiUVData.h b/include/obj/NiUVData.h
index 128b52e92702fdbdd20eb8d0497327bef76936db..a91de1419be6bc9f1211ee577378c9d58ec4e67d 100644
--- a/include/obj/NiUVData.h
+++ b/include/obj/NiUVData.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API NiUVData();
 	NIFLIB_API ~NiUVData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiVectorExtraData.h b/include/obj/NiVectorExtraData.h
index 7cae3eb8eaa19627ad3bbbdd2fb4244e959642ea..f2a580b71efd06c4aa00e9649e10e913bc823898 100644
--- a/include/obj/NiVectorExtraData.h
+++ b/include/obj/NiVectorExtraData.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiVectorExtraData();
 	NIFLIB_API ~NiVectorExtraData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiVertWeightsExtraData.h b/include/obj/NiVertWeightsExtraData.h
index 5d732708e0beeb36f832a5ee9a939b14353dca8b..b6d2362e2f78f35d248235400949c186224caf81 100644
--- a/include/obj/NiVertWeightsExtraData.h
+++ b/include/obj/NiVertWeightsExtraData.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiVertWeightsExtraData();
 	NIFLIB_API ~NiVertWeightsExtraData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiVertexColorProperty.h b/include/obj/NiVertexColorProperty.h
index 7470f4b532b183a1f7f7751597e1a8db89212712..a75cc26aa88c757686c1645793c4f80c24022bb3 100644
--- a/include/obj/NiVertexColorProperty.h
+++ b/include/obj/NiVertexColorProperty.h
@@ -25,10 +25,7 @@ public:
 	NIFLIB_API NiVertexColorProperty();
 	NIFLIB_API ~NiVertexColorProperty();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiVisController.h b/include/obj/NiVisController.h
index 93c160072d92b655dfabb0cf0dee50c4bba7633d..ee33e77f3c091d402177b83af6473822c49eaea6 100644
--- a/include/obj/NiVisController.h
+++ b/include/obj/NiVisController.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API NiVisController();
 	NIFLIB_API ~NiVisController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiVisData.h b/include/obj/NiVisData.h
index d29dcf1496505678e3e62e546c2f1e10b5307138..d3ccc21f4877dc73fb09a73cc4abad3aef466e92 100644
--- a/include/obj/NiVisData.h
+++ b/include/obj/NiVisData.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiVisData();
 	NIFLIB_API ~NiVisData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiWireframeProperty.h b/include/obj/NiWireframeProperty.h
index 20c2d0f26c900c039c0637b96fc8202e41a61737..0bbabff69b8b1eec396114c0cee58927eba509ac 100644
--- a/include/obj/NiWireframeProperty.h
+++ b/include/obj/NiWireframeProperty.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API NiWireframeProperty();
 	NIFLIB_API ~NiWireframeProperty();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/NiZBufferProperty.h b/include/obj/NiZBufferProperty.h
index f72db17448bb59d796c04d411dbbd63757a9ba45..1b173b4e27e3640ba41d5439a8c102f6bb0a7263 100644
--- a/include/obj/NiZBufferProperty.h
+++ b/include/obj/NiZBufferProperty.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API NiZBufferProperty();
 	NIFLIB_API ~NiZBufferProperty();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/RootCollisionNode.h b/include/obj/RootCollisionNode.h
index 2b1755d65e860b33a69a8bed2a869fb538f41973..cdb25cdcb55a83cce21cb931ab976c4c13383626 100644
--- a/include/obj/RootCollisionNode.h
+++ b/include/obj/RootCollisionNode.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API RootCollisionNode();
 	NIFLIB_API ~RootCollisionNode();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkBlendCollisionObject.h b/include/obj/bhkBlendCollisionObject.h
index fb04d64f7d4f96646260dd9cbe09211479f4bb7a..9088884907b8ed3421cc6e37dc2e58c5c17c7979 100644
--- a/include/obj/bhkBlendCollisionObject.h
+++ b/include/obj/bhkBlendCollisionObject.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkBlendCollisionObject();
 	NIFLIB_API ~bhkBlendCollisionObject();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkBlendController.h b/include/obj/bhkBlendController.h
index ade96a5509e693263bdcb7d22e4ddf7cc8c02a91..668664c9b293634514fc04cb9eb73701432e952a 100644
--- a/include/obj/bhkBlendController.h
+++ b/include/obj/bhkBlendController.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API bhkBlendController();
 	NIFLIB_API ~bhkBlendController();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkBoxShape.h b/include/obj/bhkBoxShape.h
index 3a67f3edb84616d2a1eec57bdb3fa36ce7adb4ec..dc0c9cd1b42779525c756bdb2ff863abd4e238f8 100644
--- a/include/obj/bhkBoxShape.h
+++ b/include/obj/bhkBoxShape.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API bhkBoxShape();
 	NIFLIB_API ~bhkBoxShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkCapsuleShape.h b/include/obj/bhkCapsuleShape.h
index 3f58d4fac7dd006a46129a8531070744a93187f7..c184685827dbb13105f1d4c1ddd5589056dd7d5d 100644
--- a/include/obj/bhkCapsuleShape.h
+++ b/include/obj/bhkCapsuleShape.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API bhkCapsuleShape();
 	NIFLIB_API ~bhkCapsuleShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkCollisionObject.h b/include/obj/bhkCollisionObject.h
index db4d1b53ccbf4f12434de020b803112c013ae93c..c677d3b4c7247cf8431973c9ae80f10418bacf84 100644
--- a/include/obj/bhkCollisionObject.h
+++ b/include/obj/bhkCollisionObject.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkCollisionObject();
 	NIFLIB_API ~bhkCollisionObject();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
 	NIFLIB_API virtual string asString( bool verbose = false ) const;
diff --git a/include/obj/bhkConvexShape.h b/include/obj/bhkConvexShape.h
index 0ee275ab1b537156fc7d276d750ef14cc58ca9f3..57ab99ac32310bd7009348d0179312605c93d154 100644
--- a/include/obj/bhkConvexShape.h
+++ b/include/obj/bhkConvexShape.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkConvexShape();
 	NIFLIB_API ~bhkConvexShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkConvexTransformShape.h b/include/obj/bhkConvexTransformShape.h
index 46152171b7e020a09b6aa934966c457af6778787..b2132e6da3c381a9b1e7d60c7b42335ad4badbb6 100644
--- a/include/obj/bhkConvexTransformShape.h
+++ b/include/obj/bhkConvexTransformShape.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkConvexTransformShape();
 	NIFLIB_API ~bhkConvexTransformShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkConvexVerticesShape.h b/include/obj/bhkConvexVerticesShape.h
index ae5b198ba2f45c98189501422c2312c62f75a780..c96bf1671088efadbbd1d4847dabe661ac358b24 100644
--- a/include/obj/bhkConvexVerticesShape.h
+++ b/include/obj/bhkConvexVerticesShape.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkConvexVerticesShape();
 	NIFLIB_API ~bhkConvexVerticesShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkEntity.h b/include/obj/bhkEntity.h
index c4d118671c4f7f689fb26079dc05c8ffaadaebf1..381e3b98e6a4fa3f32065ee84b53128286fca85e 100644
--- a/include/obj/bhkEntity.h
+++ b/include/obj/bhkEntity.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API bhkEntity();
 	NIFLIB_API ~bhkEntity();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkHingeConstraint.h b/include/obj/bhkHingeConstraint.h
index 7e8f9ae502ecbc2d8267bc2466fe7f2f8c748245..c29b028f62e960409e785c419c2107f92f5fcafd 100644
--- a/include/obj/bhkHingeConstraint.h
+++ b/include/obj/bhkHingeConstraint.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkHingeConstraint();
 	NIFLIB_API ~bhkHingeConstraint();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkLimitedHingeConstraint.h b/include/obj/bhkLimitedHingeConstraint.h
index cd8caf8be8b6b093bef096bb609f65b3bb1dcf31..31aa5da046427cf5d022ec4aad701148a5c52e0a 100644
--- a/include/obj/bhkLimitedHingeConstraint.h
+++ b/include/obj/bhkLimitedHingeConstraint.h
@@ -25,10 +25,7 @@ public:
 	NIFLIB_API bhkLimitedHingeConstraint();
 	NIFLIB_API ~bhkLimitedHingeConstraint();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkListShape.h b/include/obj/bhkListShape.h
index af8270f10d5f185488fd849acd6fd825b1360f52..8e19ba456549debca605ff8473a611d64a3980c8 100644
--- a/include/obj/bhkListShape.h
+++ b/include/obj/bhkListShape.h
@@ -27,10 +27,7 @@ public:
 	NIFLIB_API bhkListShape();
 	NIFLIB_API ~bhkListShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkMalleableConstraint.h b/include/obj/bhkMalleableConstraint.h
index 7975d1f4823374258cd87b93f4458bb164c10ddf..ddf1cb5e2dcd386ee4799104893cff6cdfc85971 100644
--- a/include/obj/bhkMalleableConstraint.h
+++ b/include/obj/bhkMalleableConstraint.h
@@ -29,10 +29,7 @@ public:
 	NIFLIB_API bhkMalleableConstraint();
 	NIFLIB_API ~bhkMalleableConstraint();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkMoppBvTreeShape.h b/include/obj/bhkMoppBvTreeShape.h
index 5a8fa1d8e89f9655cb11e82ba08f62af672f4b72..86f47fcc1f9c0d5c97ef1d03da0e256df05df2c7 100644
--- a/include/obj/bhkMoppBvTreeShape.h
+++ b/include/obj/bhkMoppBvTreeShape.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API bhkMoppBvTreeShape();
 	NIFLIB_API ~bhkMoppBvTreeShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkMultiSphereShape.h b/include/obj/bhkMultiSphereShape.h
index 1fa49552445fc9be6ee9b26219b7bde9d432661e..2526c9952215946cd0b8363336cb6d53f16a8466 100644
--- a/include/obj/bhkMultiSphereShape.h
+++ b/include/obj/bhkMultiSphereShape.h
@@ -24,10 +24,7 @@ public:
 	NIFLIB_API bhkMultiSphereShape();
 	NIFLIB_API ~bhkMultiSphereShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkNiTriStripsShape.h b/include/obj/bhkNiTriStripsShape.h
index 2f6acfc80d5a8d59d94b52da748c60ce02e854ee..07d582c40ed70cba31675dd46adeee7994fffa40 100644
--- a/include/obj/bhkNiTriStripsShape.h
+++ b/include/obj/bhkNiTriStripsShape.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API bhkNiTriStripsShape();
 	NIFLIB_API ~bhkNiTriStripsShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkPackedNiTriStripsShape.h b/include/obj/bhkPackedNiTriStripsShape.h
index f006efa8b08be0f321377de848bb12571a342aa7..adc897fc92f992aea0d552f76a517b50d04571e2 100644
--- a/include/obj/bhkPackedNiTriStripsShape.h
+++ b/include/obj/bhkPackedNiTriStripsShape.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API bhkPackedNiTriStripsShape();
 	NIFLIB_API ~bhkPackedNiTriStripsShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkPrismaticConstraint.h b/include/obj/bhkPrismaticConstraint.h
index bbfff378def0e3f1088148ccee0a79ca25d35f2c..b83f6659c77348c7cefde18c6b5fc0a674227802 100644
--- a/include/obj/bhkPrismaticConstraint.h
+++ b/include/obj/bhkPrismaticConstraint.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkPrismaticConstraint();
 	NIFLIB_API ~bhkPrismaticConstraint();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkRagdollConstraint.h b/include/obj/bhkRagdollConstraint.h
index eb574d18ee9cc9fc45e3b72a8518fa6af553e3b6..2e9825b2e93cd8c728a45e3b201ea33e7d403fbc 100644
--- a/include/obj/bhkRagdollConstraint.h
+++ b/include/obj/bhkRagdollConstraint.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkRagdollConstraint();
 	NIFLIB_API ~bhkRagdollConstraint();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkRefObject.h b/include/obj/bhkRefObject.h
index 79b09667e98ff30443f111f3b2360abfb3fe39a4..6b6be61116b9e570e74c67184e4b94e3024aad0b 100644
--- a/include/obj/bhkRefObject.h
+++ b/include/obj/bhkRefObject.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkRefObject();
 	NIFLIB_API ~bhkRefObject();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkRigidBody.h b/include/obj/bhkRigidBody.h
index 0de39e883a0f888f977731ba1ff17292159c0e97..13b1b1d7f9a267f181135265c2f78743c1f6a6b4 100644
--- a/include/obj/bhkRigidBody.h
+++ b/include/obj/bhkRigidBody.h
@@ -28,10 +28,7 @@ public:
 	NIFLIB_API bhkRigidBody();
 	NIFLIB_API ~bhkRigidBody();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkRigidBodyT.h b/include/obj/bhkRigidBodyT.h
index a634c6a4efc15b2b1b0673e493e182a9ccbe6dcf..b3f741c48b681fb1b25f7d3740c4d5749ddb8f42 100644
--- a/include/obj/bhkRigidBodyT.h
+++ b/include/obj/bhkRigidBodyT.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkRigidBodyT();
 	NIFLIB_API ~bhkRigidBodyT();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkSPCollisionObject.h b/include/obj/bhkSPCollisionObject.h
index 46e8e34e751ccdba8ce77d91adc0db6e9101c571..8be90ee163502468ff4a257f4b4ac62f843f48dc 100644
--- a/include/obj/bhkSPCollisionObject.h
+++ b/include/obj/bhkSPCollisionObject.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkSPCollisionObject();
 	NIFLIB_API ~bhkSPCollisionObject();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkSerializable.h b/include/obj/bhkSerializable.h
index ac35ec4eb536eb7cb99229c8394f356886d20efa..9db9ecdcafbc759323c8c253a365b889164065b6 100644
--- a/include/obj/bhkSerializable.h
+++ b/include/obj/bhkSerializable.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API bhkSerializable();
 	NIFLIB_API ~bhkSerializable();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkShape.h b/include/obj/bhkShape.h
index 969e8029dce66a51d05f9cd9be18840082bbd2b5..9c47449cb68bf61e1e38837cfec3c6a7f083ebfd 100644
--- a/include/obj/bhkShape.h
+++ b/include/obj/bhkShape.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkShape();
 	NIFLIB_API ~bhkShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkSimpleShapePhantom.h b/include/obj/bhkSimpleShapePhantom.h
index bb2fa0916da86724a08be29f56898d7cf920abf4..ed5a555611776ed6bf0c1972d0f9ca7f958d43d6 100644
--- a/include/obj/bhkSimpleShapePhantom.h
+++ b/include/obj/bhkSimpleShapePhantom.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkSimpleShapePhantom();
 	NIFLIB_API ~bhkSimpleShapePhantom();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkSphereRepShape.h b/include/obj/bhkSphereRepShape.h
index 03dd1cdbbde740d98b5c1e4a801f6d2ab90e8948..991b281fb7e54cf717f24894524503d6e11e8306 100644
--- a/include/obj/bhkSphereRepShape.h
+++ b/include/obj/bhkSphereRepShape.h
@@ -23,10 +23,7 @@ public:
 	NIFLIB_API bhkSphereRepShape();
 	NIFLIB_API ~bhkSphereRepShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkSphereShape.h b/include/obj/bhkSphereShape.h
index a8cd0cdc8c372984d5d52829807a87b7a222c83e..020f5f9e0f7b97702213011d0210a9a853bc9475 100644
--- a/include/obj/bhkSphereShape.h
+++ b/include/obj/bhkSphereShape.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API bhkSphereShape();
 	NIFLIB_API ~bhkSphereShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkStiffSpringConstraint.h b/include/obj/bhkStiffSpringConstraint.h
index 8328966e6ddde320b5d043017c7e4a2472a6467a..1aa51ab9ba5066fc21883f35348cda735439418a 100644
--- a/include/obj/bhkStiffSpringConstraint.h
+++ b/include/obj/bhkStiffSpringConstraint.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkStiffSpringConstraint();
 	NIFLIB_API ~bhkStiffSpringConstraint();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkTransformShape.h b/include/obj/bhkTransformShape.h
index 9eef846715be32589aef69833a7b0a37ad61f539..5d12b154837636579f5a3e12e7e3c63e536b2cce 100644
--- a/include/obj/bhkTransformShape.h
+++ b/include/obj/bhkTransformShape.h
@@ -22,10 +22,7 @@ public:
 	NIFLIB_API bhkTransformShape();
 	NIFLIB_API ~bhkTransformShape();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/bhkWorldObject.h b/include/obj/bhkWorldObject.h
index ceb4e7b4ffd37addd2f0f0116800061ff494a711..4f84705b9b1a137f0dfde6345b24ef8b0097e9a6 100644
--- a/include/obj/bhkWorldObject.h
+++ b/include/obj/bhkWorldObject.h
@@ -21,10 +21,7 @@ public:
 	NIFLIB_API bhkWorldObject();
 	NIFLIB_API ~bhkWorldObject();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/include/obj/hkPackedNiTriStripsData.h b/include/obj/hkPackedNiTriStripsData.h
index c22185cfe272cd0be223a2e3956520a8a9c80c20..fb6cdf750838e5bc135dddb7a25113d6a8458184 100644
--- a/include/obj/hkPackedNiTriStripsData.h
+++ b/include/obj/hkPackedNiTriStripsData.h
@@ -25,10 +25,7 @@ public:
 	NIFLIB_API hkPackedNiTriStripsData();
 	NIFLIB_API ~hkPackedNiTriStripsData();
 	//Run-Time Type Information
-	NIFLIB_API static const Type & TypeConst();
-private:
-	static const Type TYPE;
-public:
+	NIFLIB_API static const Type TYPE;
 	NIFLIB_API virtual const Type & GetType() const;
 	NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info );
 	NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const;
diff --git a/src/ComplexShape.cpp b/src/ComplexShape.cpp
index 8a39b6a915af247a5224150e6b68579a997dfdf1..283c185f760d7295bc4769233f6a20826e219b2c 100644
--- a/src/ComplexShape.cpp
+++ b/src/ComplexShape.cpp
@@ -188,17 +188,17 @@ void ComplexShape::Merge( NiAVObject * root ) {
 	vector<NiTriBasedGeomRef> shapes;
 
 	//Determine root type
-	if ( root->IsDerivedType( NiTriBasedGeom::TypeConst() ) ) {
+	if ( root->IsDerivedType( NiTriBasedGeom::TYPE ) ) {
 		//The function was called on a single shape.
 		//Add it to the list
 		shapes.push_back( DynamicCast<NiTriBasedGeom>(root) );
-	} else if ( root->IsDerivedType( NiNode::TypeConst() ) ) {
+	} else if ( root->IsDerivedType( NiNode::TYPE ) ) {
 		//The function was called on a NiNOde.  Search for
 		//shape children
 		NiNodeRef nodeRoot = DynamicCast<NiNode>(root);
 		vector<NiAVObjectRef> children = nodeRoot->GetChildren();
 		for ( unsigned int child = 0; child < children.size(); ++child ) {
-			if ( children[child]->IsDerivedType( NiTriBasedGeom::TypeConst() ) ) {
+			if ( children[child]->IsDerivedType( NiTriBasedGeom::TYPE ) ) {
 				shapes.push_back( DynamicCast<NiTriBasedGeom>(children[child]) );
 			}
 		}
@@ -334,7 +334,7 @@ void ComplexShape::Merge( NiAVObject * root ) {
 		for ( unsigned int tex = 0; tex < uvSetList.size(); ++tex ) {
 			uvSetList[tex] = BASE_MAP;
 		}
-		NiPropertyRef niProp = (*geom)->GetPropertyByType( NiTexturingProperty::TypeConst() );
+		NiPropertyRef niProp = (*geom)->GetPropertyByType( NiTexturingProperty::TYPE );
 		NiTexturingPropertyRef niTexProp;
 		if ( niProp != NULL ) {
 			niTexProp = DynamicCast<NiTexturingProperty>(niProp);
@@ -680,7 +680,7 @@ Ref<NiAVObject> ComplexShape::Split( NiNode * parent, Matrix44 & transform, int
 
 		//Search for a NiTexturingProperty to build list of
 		//texture cooridinate sets to create
-		NiPropertyRef niProp = shapes[shape_num]->GetPropertyByType( NiTexturingProperty::TypeConst() );
+		NiPropertyRef niProp = shapes[shape_num]->GetPropertyByType( NiTexturingProperty::TYPE );
 		NiTexturingPropertyRef niTexProp;
 		if ( niProp != NULL ) {
 			niTexProp = DynamicCast<NiTexturingProperty>(niProp);
diff --git a/src/niflib.cpp b/src/niflib.cpp
index 5f3729718502a08cb334bcf0dec58efe76e01eb3..6a18a0542c7ac0c687e5bcbfcf525c53aa4fca9e 100644
--- a/src/niflib.cpp
+++ b/src/niflib.cpp
@@ -447,10 +447,10 @@ void WriteNifTree( ostream & out, list<NiObjectRef> const & roots, const NifInfo
    footer.numRoots = 0;
    if (roots.size() == 1) {
       const NiObjectRef& root = roots.front();
-      if (root->IsDerivedType(NiControllerSequence::TypeConst())) {
+      if (root->IsDerivedType(NiControllerSequence::TYPE)) {
          // KF animation files allow for multiple roots of type NiControllerSequence
          for ( unsigned int i = 0; i < objects.size(); ++i ) {
-            if (objects[i]->IsDerivedType(NiControllerSequence::TypeConst())) {
+            if (objects[i]->IsDerivedType(NiControllerSequence::TYPE)) {
                footer.roots.push_back(objects[i]);
             }
          }
@@ -515,8 +515,8 @@ void EnumerateObjects( NiObject * root, map<Type*,unsigned int> & type_map, map<
    //   a more generic mechanism in the future.
 	Type *t = (Type*)&(root->GetType());
    if (  reverse
-      || t->IsDerivedType(bhkRigidBody::TypeConst()) 
-      || t->IsDerivedType(bhkCollisionObject::TypeConst())
+      || t->IsDerivedType(bhkRigidBody::TYPE) 
+      || t->IsDerivedType(bhkCollisionObject::TYPE)
       )
    {
       reverse = true;
@@ -596,7 +596,7 @@ static std::string CreateFileName(std::string name) {
 static void SplitNifTree( NiObject * root_object, NiObject * xnif_root, list<NiObjectRef> & xkf_roots, Kfm & kfm, int kf_type, const NifInfo & info ) {
 	// Do we have animation groups (a NiTextKeyExtraData object)?
 	// If so, create XNif and XKf trees.
-	NiObjectRef txtkey = GetObjectByType( root_object, NiTextKeyExtraData::TypeConst() );
+	NiObjectRef txtkey = GetObjectByType( root_object, NiTextKeyExtraData::TYPE );
 	NiTextKeyExtraDataRef txtkey_obj;
 	if ( txtkey != NULL ) {
 		txtkey_obj = DynamicCast<NiTextKeyExtraData>(txtkey);
@@ -608,7 +608,7 @@ static void SplitNifTree( NiObject * root_object, NiObject * xnif_root, list<NiO
 			xnif_root = CloneNifTree( root_object, info.version, info.userVersion );
 				
 			// Now search and locate newer timeframe controllers and convert to keyframecontrollers
-			list<NiObjectRef> mgrs = GetAllObjectsByType( xnif_root, NiControllerManager::TypeConst() );
+			list<NiObjectRef> mgrs = GetAllObjectsByType( xnif_root, NiControllerManager::TYPE );
 			for ( list<NiObjectRef>::iterator it = mgrs.begin(); it != mgrs.end(); ++it) {
 				NiControllerManagerRef mgr = DynamicCast<NiControllerManager>(*it);
 				if ( mgr == NULL ) {
@@ -631,7 +631,7 @@ static void SplitNifTree( NiObject * root_object, NiObject * xnif_root, list<NiO
 			// Append NiNodes with a NiKeyFrameController as NiStringExtraData objects.
 			list< pair< NiNodeRef, NiKeyframeControllerRef> > node_controllers;
 
-			list<NiObjectRef> nodes = GetAllObjectsByType( xnif_root, NiNode::TypeConst() );
+			list<NiObjectRef> nodes = GetAllObjectsByType( xnif_root, NiNode::TYPE );
 			for ( list<NiObjectRef>::iterator it = nodes.begin(); it != nodes.end(); ++it) {
 				NiNodeRef node = DynamicCast<NiNode>(*it);
 				if ( node == NULL ) {
@@ -643,9 +643,9 @@ static void SplitNifTree( NiObject * root_object, NiObject * xnif_root, list<NiO
 				NiKeyframeControllerRef key_controller;
 				for ( list<NiTimeControllerRef>::iterator it = controllers.begin(); it != controllers.end(); ++it ) {
 
-					if ((*it)->IsDerivedType(NiKeyframeController::TypeConst())) {
+					if ((*it)->IsDerivedType(NiKeyframeController::TYPE)) {
 						key_controller = StaticCast<NiKeyframeController>(*it);
-					} else if ((*it)->IsDerivedType(NiTransformController::TypeConst())) {
+					} else if ((*it)->IsDerivedType(NiTransformController::TYPE)) {
 						NiTransformControllerRef trans = StaticCast<NiTransformController>(*it);
 						NiTransformInterpolatorRef interp = DynamicCast<NiTransformInterpolator>(trans->GetInterpolator());
 						if (interp != NULL) {
@@ -705,7 +705,7 @@ static void SplitNifTree( NiObject * root_object, NiObject * xnif_root, list<NiO
 			// Construct the Nif file without transform controllers ...
 			xnif_root = CloneNifTree( root_object, info.version, info.userVersion );
 
-			list<NiObjectRef> mgrs = GetAllObjectsByType( xnif_root, NiControllerManager::TypeConst() );
+			list<NiObjectRef> mgrs = GetAllObjectsByType( xnif_root, NiControllerManager::TYPE );
 			for ( list<NiObjectRef>::iterator it = mgrs.begin(); it != mgrs.end(); ++it) {
 				NiControllerManagerRef mgr = DynamicCast<NiControllerManager>(*it);
 				if ( mgr == NULL ) {
diff --git a/src/obj/ABoneLODController.cpp b/src/obj/ABoneLODController.cpp
index 21379ee1f2a94e59c6df6158971b65182c1bb2d9..057818a86ac32326628145fc936a038f9aadb838 100644
--- a/src/obj/ABoneLODController.cpp
+++ b/src/obj/ABoneLODController.cpp
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type ABoneLODController::TYPE("ABoneLODController", &A_BONE_L_O_D_CONTROLLER_PARENT::TypeConst() );
+const Type ABoneLODController::TYPE("ABoneLODController", &A_BONE_L_O_D_CONTROLLER_PARENT::TYPE );
 
 ABoneLODController::ABoneLODController() A_BONE_L_O_D_CONTROLLER_CONSTRUCT {}
 
@@ -99,7 +99,3 @@ void ABoneLODController::ClearNodeGroups() {
    nodeGroups.clear();
    numNodeGroups2 = nodeGroups.size();
 }
-
-const Type & ABoneLODController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/AKeyedData.cpp b/src/obj/AKeyedData.cpp
index d40631c0c4f33a3d6ea71bbe04a814f2505cee7f..5c6ea998c839c13772b181d4a88fb6ff348e9b41 100644
--- a/src/obj/AKeyedData.cpp
+++ b/src/obj/AKeyedData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type AKeyedData::TYPE("AKeyedData", &A_KEYED_DATA_PARENT::TypeConst() );
+const Type AKeyedData::TYPE("AKeyedData", &A_KEYED_DATA_PARENT::TYPE );
 
 AKeyedData::AKeyedData() A_KEYED_DATA_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> AKeyedData::GetRefs() const {
 const Type & AKeyedData::GetType() const {
 	return TYPE;
 };
-
-const Type & AKeyedData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/APSysCtlr.cpp b/src/obj/APSysCtlr.cpp
index 492da492bbfcbb8f1ab13b689cf90445174593d0..e400297764e3c21e70e9242022fde0ad5a40286c 100644
--- a/src/obj/APSysCtlr.cpp
+++ b/src/obj/APSysCtlr.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type APSysCtlr::TYPE("APSysCtlr", &A_P_SYS_CTLR_PARENT::TypeConst() );
+const Type APSysCtlr::TYPE("APSysCtlr", &A_P_SYS_CTLR_PARENT::TYPE );
 
 APSysCtlr::APSysCtlr() A_P_SYS_CTLR_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ string APSysCtlr::GetModifierName() const {
 void APSysCtlr::SetModifierName( string value ) {
 	modifierName = value;
 }
-
-const Type & APSysCtlr::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/APSysData.cpp b/src/obj/APSysData.cpp
index 759f3ebaf1a260b9f39222f9456c9728a2017706..794758e22db9b61635545a4210ee4c909db44f4b 100644
--- a/src/obj/APSysData.cpp
+++ b/src/obj/APSysData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type APSysData::TYPE("APSysData", &A_P_SYS_DATA_PARENT::TypeConst() );
+const Type APSysData::TYPE("APSysData", &A_P_SYS_DATA_PARENT::TYPE );
 
 APSysData::APSysData() A_P_SYS_DATA_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> APSysData::GetRefs() const {
 const Type & APSysData::GetType() const {
 	return TYPE;
 };
-
-const Type & APSysData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/AParticleModifier.cpp b/src/obj/AParticleModifier.cpp
index fc90e3eab9ea9ea45e26be77639e11122bcf7365..76c75a7275097e8b5338a7ee4846cdbb1cd3e8ce 100644
--- a/src/obj/AParticleModifier.cpp
+++ b/src/obj/AParticleModifier.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type AParticleModifier::TYPE("AParticleModifier", &A_PARTICLE_MODIFIER_PARENT::TypeConst() );
+const Type AParticleModifier::TYPE("AParticleModifier", &A_PARTICLE_MODIFIER_PARENT::TYPE );
 
 AParticleModifier::AParticleModifier() A_PARTICLE_MODIFIER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> AParticleModifier::GetRefs() const {
 const Type & AParticleModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & AParticleModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/AbhkConstraint.cpp b/src/obj/AbhkConstraint.cpp
index ea67dcc5d4a56685d9af10a28d38b09987693983..cf17aa22e3f5252cf7804da6d815eff19088ed82 100644
--- a/src/obj/AbhkConstraint.cpp
+++ b/src/obj/AbhkConstraint.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type AbhkConstraint::TYPE("AbhkConstraint", &ABHK_CONSTRAINT_PARENT::TypeConst() );
+const Type AbhkConstraint::TYPE("AbhkConstraint", &ABHK_CONSTRAINT_PARENT::TYPE );
 
 AbhkConstraint::AbhkConstraint() ABHK_CONSTRAINT_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> AbhkConstraint::GetRefs() const {
 const Type & AbhkConstraint::GetType() const {
 	return TYPE;
 };
-
-const Type & AbhkConstraint::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/AbhkRagdollConstraint.cpp b/src/obj/AbhkRagdollConstraint.cpp
index b881c7f7d90925ef59f1f00068d74d35c4241579..620b15db98a58bbb16a2f73e670106d0710021d5 100644
--- a/src/obj/AbhkRagdollConstraint.cpp
+++ b/src/obj/AbhkRagdollConstraint.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type AbhkRagdollConstraint::TYPE("AbhkRagdollConstraint", &ABHK_RAGDOLL_CONSTRAINT_PARENT::TypeConst() );
+const Type AbhkRagdollConstraint::TYPE("AbhkRagdollConstraint", &ABHK_RAGDOLL_CONSTRAINT_PARENT::TYPE );
 
 AbhkRagdollConstraint::AbhkRagdollConstraint() ABHK_RAGDOLL_CONSTRAINT_CONSTRUCT {}
 
@@ -35,6 +35,3 @@ const Type & AbhkRagdollConstraint::GetType() const {
 	return TYPE;
 };
 
-const Type & AbhkRagdollConstraint::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/AbhkShapeCollection.cpp b/src/obj/AbhkShapeCollection.cpp
index 1c022da744a3217fa93c8c22e0142430b627af1b..9a2db0b29e731776922f54a60a48b0e3fc2ca18b 100644
--- a/src/obj/AbhkShapeCollection.cpp
+++ b/src/obj/AbhkShapeCollection.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type AbhkShapeCollection::TYPE("AbhkShapeCollection", &ABHK_SHAPE_COLLECTION_PARENT::TypeConst() );
+const Type AbhkShapeCollection::TYPE("AbhkShapeCollection", &ABHK_SHAPE_COLLECTION_PARENT::TYPE );
 
 AbhkShapeCollection::AbhkShapeCollection() ABHK_SHAPE_COLLECTION_CONSTRUCT {}
 
@@ -35,6 +35,3 @@ const Type & AbhkShapeCollection::GetType() const {
 	return TYPE;
 };
 
-const Type & AbhkShapeCollection::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/AvoidNode.cpp b/src/obj/AvoidNode.cpp
index fafb48821b00411a3db0b366ef4193a49e6838d1..390e600d12debb96f2a8cf0fdf22f9833710cdf2 100644
--- a/src/obj/AvoidNode.cpp
+++ b/src/obj/AvoidNode.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type AvoidNode::TYPE("AvoidNode", &AVOID_NODE_PARENT::TypeConst() );
+const Type AvoidNode::TYPE("AvoidNode", &AVOID_NODE_PARENT::TYPE );
 
 AvoidNode::AvoidNode() AVOID_NODE_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> AvoidNode::GetRefs() const {
 const Type & AvoidNode::GetType() const {
 	return TYPE;
 };
-
-const Type & AvoidNode::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/BSBound.cpp b/src/obj/BSBound.cpp
index 585b8befa8ee185f4031435cbee4678f34cb0332..15479d566beef66863b9c24eb04fd5843ea066d5 100644
--- a/src/obj/BSBound.cpp
+++ b/src/obj/BSBound.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type BSBound::TYPE("BSBound", &B_S_BOUND_PARENT::TypeConst() );
+const Type BSBound::TYPE("BSBound", &B_S_BOUND_PARENT::TYPE );
 
 BSBound::BSBound() B_S_BOUND_CONSTRUCT {}
 
@@ -50,7 +50,3 @@ Vector3 BSBound::GetDimensions() const {
 void BSBound::SetDimensions( const Vector3 & value ) {
 	dimensions = value;
 }
-
-const Type & BSBound::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/BSFurnitureMarker.cpp b/src/obj/BSFurnitureMarker.cpp
index dc1061f6e79603af257e872c60303023573a6539..14696e4c040e4874f6560db64f0b025e68a6a17c 100644
--- a/src/obj/BSFurnitureMarker.cpp
+++ b/src/obj/BSFurnitureMarker.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type BSFurnitureMarker::TYPE("BSFurnitureMarker", &B_S_FURNITURE_MARKER_PARENT::TypeConst() );
+const Type BSFurnitureMarker::TYPE("BSFurnitureMarker", &B_S_FURNITURE_MARKER_PARENT::TYPE );
 
 BSFurnitureMarker::BSFurnitureMarker() B_S_FURNITURE_MARKER_CONSTRUCT {}
 
@@ -44,7 +44,3 @@ void BSFurnitureMarker::SetFurniturePositions( const vector<FurniturePosition> &
 	numPositions = (unsigned int)(n.size());
 	positions = n;
 }
-
-const Type & BSFurnitureMarker::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/BSKeyframeController.cpp b/src/obj/BSKeyframeController.cpp
index 3fab29c7929f4ae952872c485671548d32bc7924..c7268d46339eff5a1dc68d8442173dc4bd697057 100644
--- a/src/obj/BSKeyframeController.cpp
+++ b/src/obj/BSKeyframeController.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type BSKeyframeController::TYPE("BSKeyframeController", &B_S_KEYFRAME_CONTROLLER_PARENT::TypeConst() );
+const Type BSKeyframeController::TYPE("BSKeyframeController", &B_S_KEYFRAME_CONTROLLER_PARENT::TYPE );
 
 BSKeyframeController::BSKeyframeController() B_S_KEYFRAME_CONTROLLER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> BSKeyframeController::GetRefs() const {
 const Type & BSKeyframeController::GetType() const {
 	return TYPE;
 };
-
-const Type & BSKeyframeController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/BSPSysArrayEmitter.cpp b/src/obj/BSPSysArrayEmitter.cpp
index a50cc5003b088373e50a7bc5ce8f38ddca077156..bddbdc6d166d9088a65255fe8b80af8303302b92 100644
--- a/src/obj/BSPSysArrayEmitter.cpp
+++ b/src/obj/BSPSysArrayEmitter.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type BSPSysArrayEmitter::TYPE("BSPSysArrayEmitter", &B_S_P_SYS_ARRAY_EMITTER_PARENT::TypeConst() );
+const Type BSPSysArrayEmitter::TYPE("BSPSysArrayEmitter", &B_S_P_SYS_ARRAY_EMITTER_PARENT::TYPE );
 
 BSPSysArrayEmitter::BSPSysArrayEmitter() B_S_P_SYS_ARRAY_EMITTER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> BSPSysArrayEmitter::GetRefs() const {
 const Type & BSPSysArrayEmitter::GetType() const {
 	return TYPE;
 };
-
-const Type & BSPSysArrayEmitter::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/BSParentVelocityModifier.cpp b/src/obj/BSParentVelocityModifier.cpp
index 159d07d7c4041d0d8157ca01c498184f792000ef..afc41ad9ddc9ec7c3b6a00278230440e9e5cafb1 100644
--- a/src/obj/BSParentVelocityModifier.cpp
+++ b/src/obj/BSParentVelocityModifier.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type BSParentVelocityModifier::TYPE("BSParentVelocityModifier", &B_S_PARENT_VELOCITY_MODIFIER_PARENT::TypeConst() );
+const Type BSParentVelocityModifier::TYPE("BSParentVelocityModifier", &B_S_PARENT_VELOCITY_MODIFIER_PARENT::TYPE );
 
 BSParentVelocityModifier::BSParentVelocityModifier() B_S_PARENT_VELOCITY_MODIFIER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> BSParentVelocityModifier::GetRefs() const {
 const Type & BSParentVelocityModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & BSParentVelocityModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/BSXFlags.cpp b/src/obj/BSXFlags.cpp
index 6cb205b4b6a329f8df3cdfde0a1028b1a9c5be4d..bf8c8331554005e2caf7406199865ce03b6a1e41 100644
--- a/src/obj/BSXFlags.cpp
+++ b/src/obj/BSXFlags.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type BSXFlags::TYPE("BSXFlags", &B_S_X_FLAGS_PARENT::TypeConst() );
+const Type BSXFlags::TYPE("BSXFlags", &B_S_X_FLAGS_PARENT::TYPE );
 
 BSXFlags::BSXFlags() B_S_X_FLAGS_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ unsigned int BSXFlags::GetFlags() const {
 void BSXFlags::SetFlags( unsigned int value ) {
 	flags = value;
 }
-
-const Type & BSXFlags::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/FxButton.cpp b/src/obj/FxButton.cpp
index 45956020b135e66f68fb31ecb42e4fd06afaa8bb..3aeed02c799f2aeaa78ba2da88255ff35341ec1c 100644
--- a/src/obj/FxButton.cpp
+++ b/src/obj/FxButton.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type FxButton::TYPE("FxButton", &FX_BUTTON_PARENT::TypeConst() );
+const Type FxButton::TYPE("FxButton", &FX_BUTTON_PARENT::TYPE );
 
 FxButton::FxButton() FX_BUTTON_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> FxButton::GetRefs() const {
 const Type & FxButton::GetType() const {
 	return TYPE;
 };
-
-const Type & FxButton::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/FxRadioButton.cpp b/src/obj/FxRadioButton.cpp
index c9cd295f5b9c0dd4f8e3c88871977d24a05b2f90..6e1f9edf4f8c948328a6b6bf668ca43306d52c23 100644
--- a/src/obj/FxRadioButton.cpp
+++ b/src/obj/FxRadioButton.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type FxRadioButton::TYPE("FxRadioButton", &FX_RADIO_BUTTON_PARENT::TypeConst() );
+const Type FxRadioButton::TYPE("FxRadioButton", &FX_RADIO_BUTTON_PARENT::TYPE );
 
 FxRadioButton::FxRadioButton() FX_RADIO_BUTTON_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> FxRadioButton::GetRefs() const {
 const Type & FxRadioButton::GetType() const {
 	return TYPE;
 };
-
-const Type & FxRadioButton::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/FxWidget.cpp b/src/obj/FxWidget.cpp
index 9f92fd4e6193cc97af0c993bd02d72da190ede59..6ca7a9f6d7c8329876484eec664df7cbfcadb033 100644
--- a/src/obj/FxWidget.cpp
+++ b/src/obj/FxWidget.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type FxWidget::TYPE("FxWidget", &FX_WIDGET_PARENT::TypeConst() );
+const Type FxWidget::TYPE("FxWidget", &FX_WIDGET_PARENT::TYPE );
 
 FxWidget::FxWidget() FX_WIDGET_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> FxWidget::GetRefs() const {
 const Type & FxWidget::GetType() const {
 	return TYPE;
 };
-
-const Type & FxWidget::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiAVObject.cpp b/src/obj/NiAVObject.cpp
index e31506261daa8d655e74f227b0d7dfcd3aaa8c5a..2eb517f3c5c53dc7b14e90a6d87c245d8f9b72c8 100644
--- a/src/obj/NiAVObject.cpp
+++ b/src/obj/NiAVObject.cpp
@@ -9,7 +9,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiAVObject::TYPE("NiAVObject", &NI_A_V_OBJECT_PARENT::TypeConst() );
+const Type NiAVObject::TYPE("NiAVObject", &NI_A_V_OBJECT_PARENT::TYPE );
 
 NiAVObject::NiAVObject() NI_A_V_OBJECT_CONSTRUCT, parent(NULL) {}
 
@@ -239,7 +239,3 @@ void NiAVObject::SetBoundingBox( const BoundingBox & n ) {
 const Type & NiAVObject::GetType() const {
 	return TYPE;
 };
-
-const Type & NiAVObject::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiAlphaController.cpp b/src/obj/NiAlphaController.cpp
index 41d8783cf57d2ec25a055a8d9b842e32f9ae45d1..94e7b63881eafb4051acc43c581026604f87f992 100644
--- a/src/obj/NiAlphaController.cpp
+++ b/src/obj/NiAlphaController.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiAlphaController::TYPE("NiAlphaController", &NI_ALPHA_CONTROLLER_PARENT::TypeConst() );
+const Type NiAlphaController::TYPE("NiAlphaController", &NI_ALPHA_CONTROLLER_PARENT::TYPE );
 
 NiAlphaController::NiAlphaController() NI_ALPHA_CONTROLLER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiAlphaController::GetRefs() const {
 const Type & NiAlphaController::GetType() const {
 	return TYPE;
 };
-
-const Type & NiAlphaController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiAlphaProperty.cpp b/src/obj/NiAlphaProperty.cpp
index 5d7bc1a8d611e1d47adb41b19a37b752b7489f17..87aee482db02e3113ad710f44ff310ba91351300 100644
--- a/src/obj/NiAlphaProperty.cpp
+++ b/src/obj/NiAlphaProperty.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiAlphaProperty::TYPE("NiAlphaProperty", &NI_ALPHA_PROPERTY_PARENT::TypeConst() );
+const Type NiAlphaProperty::TYPE("NiAlphaProperty", &NI_ALPHA_PROPERTY_PARENT::TYPE );
 
 NiAlphaProperty::NiAlphaProperty() NI_ALPHA_PROPERTY_CONSTRUCT {}
 
@@ -103,7 +103,3 @@ bool NiAlphaProperty::GetTriangleSortMode() const {
 void NiAlphaProperty::SetTriangleSortMode(bool value) {
    flags = NIFLIB_MASK_FLAG(flags, value?0:1, 13, 0x1);
 }
-
-const Type & NiAlphaProperty::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiAmbientLight.cpp b/src/obj/NiAmbientLight.cpp
index c78414ca59e9b0af7cc33ab44f2c7c880bd6f633..b584b732c88d1ac43169af45e35efb07d8b18d26 100644
--- a/src/obj/NiAmbientLight.cpp
+++ b/src/obj/NiAmbientLight.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiAmbientLight::TYPE("NiAmbientLight", &NI_AMBIENT_LIGHT_PARENT::TypeConst() );
+const Type NiAmbientLight::TYPE("NiAmbientLight", &NI_AMBIENT_LIGHT_PARENT::TYPE );
 
 NiAmbientLight::NiAmbientLight() NI_AMBIENT_LIGHT_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiAmbientLight::GetRefs() const {
 const Type & NiAmbientLight::GetType() const {
 	return TYPE;
 };
-
-const Type & NiAmbientLight::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiAutoNormalParticles.cpp b/src/obj/NiAutoNormalParticles.cpp
index a855b16eb174ed06d0658cabe9f143284f31957b..b88e90ee9c37080b0e31523bc07723a269c41114 100644
--- a/src/obj/NiAutoNormalParticles.cpp
+++ b/src/obj/NiAutoNormalParticles.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiAutoNormalParticles::TYPE("NiAutoNormalParticles", &NI_AUTO_NORMAL_PARTICLES_PARENT::TypeConst() );
+const Type NiAutoNormalParticles::TYPE("NiAutoNormalParticles", &NI_AUTO_NORMAL_PARTICLES_PARENT::TYPE );
 
 NiAutoNormalParticles::NiAutoNormalParticles() NI_AUTO_NORMAL_PARTICLES_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiAutoNormalParticles::GetRefs() const {
 const Type & NiAutoNormalParticles::GetType() const {
 	return TYPE;
 };
-
-const Type & NiAutoNormalParticles::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiAutoNormalParticlesData.cpp b/src/obj/NiAutoNormalParticlesData.cpp
index 494d5d2ec1fbd2fa63fdb2c5bd58eaa0f8429858..4f6a50854206f5463a005d5dcaa5becc16b3392a 100644
--- a/src/obj/NiAutoNormalParticlesData.cpp
+++ b/src/obj/NiAutoNormalParticlesData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiAutoNormalParticlesData::TYPE("NiAutoNormalParticlesData", &NI_AUTO_NORMAL_PARTICLES_DATA_PARENT::TypeConst() );
+const Type NiAutoNormalParticlesData::TYPE("NiAutoNormalParticlesData", &NI_AUTO_NORMAL_PARTICLES_DATA_PARENT::TYPE );
 
 NiAutoNormalParticlesData::NiAutoNormalParticlesData() NI_AUTO_NORMAL_PARTICLES_DATA_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiAutoNormalParticlesData::GetRefs() const {
 const Type & NiAutoNormalParticlesData::GetType() const {
 	return TYPE;
 };
-
-const Type & NiAutoNormalParticlesData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBSAnimationNode.cpp b/src/obj/NiBSAnimationNode.cpp
index 6e841316ed9947572893e6cf899877fe2219a0c6..f6cc4eac2c55bc9fede288202f82f07f1f498738 100644
--- a/src/obj/NiBSAnimationNode.cpp
+++ b/src/obj/NiBSAnimationNode.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBSAnimationNode::TYPE("NiBSAnimationNode", &NI_B_S_ANIMATION_NODE_PARENT::TypeConst() );
+const Type NiBSAnimationNode::TYPE("NiBSAnimationNode", &NI_B_S_ANIMATION_NODE_PARENT::TYPE );
 
 NiBSAnimationNode::NiBSAnimationNode() NI_B_S_ANIMATION_NODE_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiBSAnimationNode::GetRefs() const {
 const Type & NiBSAnimationNode::GetType() const {
 	return TYPE;
 };
-
-const Type & NiBSAnimationNode::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBSBoneLODController.cpp b/src/obj/NiBSBoneLODController.cpp
index 7a455928ec3f0298320a64a4ce0723a6bee9af9c..11c257700492f73260889fbf4a492318c64d4c09 100644
--- a/src/obj/NiBSBoneLODController.cpp
+++ b/src/obj/NiBSBoneLODController.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBSBoneLODController::TYPE("NiBSBoneLODController", &NI_B_S_BONE_L_O_D_CONTROLLER_PARENT::TypeConst() );
+const Type NiBSBoneLODController::TYPE("NiBSBoneLODController", &NI_B_S_BONE_L_O_D_CONTROLLER_PARENT::TYPE );
 
 NiBSBoneLODController::NiBSBoneLODController() NI_B_S_BONE_L_O_D_CONTROLLER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiBSBoneLODController::GetRefs() const {
 const Type & NiBSBoneLODController::GetType() const {
 	return TYPE;
 };
-
-const Type & NiBSBoneLODController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBSPArrayController.cpp b/src/obj/NiBSPArrayController.cpp
index b07e561ab112f9c291d6e42d7b669252f0113d78..cf60d196bd9d6c5b5f5f001d115678f57fac6f30 100644
--- a/src/obj/NiBSPArrayController.cpp
+++ b/src/obj/NiBSPArrayController.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBSPArrayController::TYPE("NiBSPArrayController", &NI_B_S_P_ARRAY_CONTROLLER_PARENT::TypeConst() );
+const Type NiBSPArrayController::TYPE("NiBSPArrayController", &NI_B_S_P_ARRAY_CONTROLLER_PARENT::TYPE );
 
 NiBSPArrayController::NiBSPArrayController() NI_B_S_P_ARRAY_CONTROLLER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiBSPArrayController::GetRefs() const {
 const Type & NiBSPArrayController::GetType() const {
 	return TYPE;
 };
-
-const Type & NiBSPArrayController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBSParticleNode.cpp b/src/obj/NiBSParticleNode.cpp
index 84c93f9e0d57f5a8f19e2705fa93cd68426f2ec9..726459d9379002b625f481c8752257b24fead942 100644
--- a/src/obj/NiBSParticleNode.cpp
+++ b/src/obj/NiBSParticleNode.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBSParticleNode::TYPE("NiBSParticleNode", &NI_B_S_PARTICLE_NODE_PARENT::TypeConst() );
+const Type NiBSParticleNode::TYPE("NiBSParticleNode", &NI_B_S_PARTICLE_NODE_PARENT::TYPE );
 
 NiBSParticleNode::NiBSParticleNode() NI_B_S_PARTICLE_NODE_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiBSParticleNode::GetRefs() const {
 const Type & NiBSParticleNode::GetType() const {
 	return TYPE;
 };
-
-const Type & NiBSParticleNode::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBSplineBasisData.cpp b/src/obj/NiBSplineBasisData.cpp
index 24f010f1e7699c7815be942bd625aa5e3394d947..b5ada2cb7661430854572b0646bc91a82b64a7c7 100644
--- a/src/obj/NiBSplineBasisData.cpp
+++ b/src/obj/NiBSplineBasisData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBSplineBasisData::TYPE("NiBSplineBasisData", &NI_B_SPLINE_BASIS_DATA_PARENT::TypeConst() );
+const Type NiBSplineBasisData::TYPE("NiBSplineBasisData", &NI_B_SPLINE_BASIS_DATA_PARENT::TYPE );
 
 NiBSplineBasisData::NiBSplineBasisData() NI_B_SPLINE_BASIS_DATA_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ unsigned int NiBSplineBasisData::GetNumControlPt() const {
 void NiBSplineBasisData::SetNumControlPt( unsigned int value ) {
 	numControlPt = value;
 }
-
-const Type & NiBSplineBasisData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBSplineCompFloatInterpolator.cpp b/src/obj/NiBSplineCompFloatInterpolator.cpp
index b05bb04c5317068baf2e045894a2b03042964774..8b7306a93e70ed739b7f3751b96d9c872833c5a6 100644
--- a/src/obj/NiBSplineCompFloatInterpolator.cpp
+++ b/src/obj/NiBSplineCompFloatInterpolator.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBSplineCompFloatInterpolator::TYPE("NiBSplineCompFloatInterpolator", &NI_B_SPLINE_COMP_FLOAT_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiBSplineCompFloatInterpolator::TYPE("NiBSplineCompFloatInterpolator", &NI_B_SPLINE_COMP_FLOAT_INTERPOLATOR_PARENT::TYPE );
 
 NiBSplineCompFloatInterpolator::NiBSplineCompFloatInterpolator() NI_B_SPLINE_COMP_FLOAT_INTERPOLATOR_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiBSplineCompFloatInterpolator::GetRefs() const {
 const Type & NiBSplineCompFloatInterpolator::GetType() const {
 	return TYPE;
 };
-
-const Type & NiBSplineCompFloatInterpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBSplineCompPoint3Interpolator.cpp b/src/obj/NiBSplineCompPoint3Interpolator.cpp
index 73f988ce1900ba61acb257c28e0410b14840c2e3..3eb7ca3c207869547069da894a8cd8dc9c715a6f 100644
--- a/src/obj/NiBSplineCompPoint3Interpolator.cpp
+++ b/src/obj/NiBSplineCompPoint3Interpolator.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBSplineCompPoint3Interpolator::TYPE("NiBSplineCompPoint3Interpolator", &NI_B_SPLINE_COMP_POINT3_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiBSplineCompPoint3Interpolator::TYPE("NiBSplineCompPoint3Interpolator", &NI_B_SPLINE_COMP_POINT3_INTERPOLATOR_PARENT::TYPE );
 
 NiBSplineCompPoint3Interpolator::NiBSplineCompPoint3Interpolator() NI_B_SPLINE_COMP_POINT3_INTERPOLATOR_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiBSplineCompPoint3Interpolator::GetRefs() const {
 const Type & NiBSplineCompPoint3Interpolator::GetType() const {
 	return TYPE;
 };
-
-const Type & NiBSplineCompPoint3Interpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBSplineCompTransformInterpolator.cpp b/src/obj/NiBSplineCompTransformInterpolator.cpp
index 9fa3e06444366ea71b3db06bd97a20dc9333611c..1db53bcdf45346d7348095b317225c0a630b01a6 100644
--- a/src/obj/NiBSplineCompTransformInterpolator.cpp
+++ b/src/obj/NiBSplineCompTransformInterpolator.cpp
@@ -11,7 +11,7 @@ static const int SizeofTrans = 3;
 static const int SizeofScale = 1;
 
 //Definition of TYPE constant
-const Type NiBSplineCompTransformInterpolator::TYPE("NiBSplineCompTransformInterpolator", &NI_B_SPLINE_COMP_TRANSFORM_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiBSplineCompTransformInterpolator::TYPE("NiBSplineCompTransformInterpolator", &NI_B_SPLINE_COMP_TRANSFORM_INTERPOLATOR_PARENT::TYPE );
 
 NiBSplineCompTransformInterpolator::NiBSplineCompTransformInterpolator() NI_B_SPLINE_COMP_TRANSFORM_INTERPOLATOR_CONSTRUCT {}
 
@@ -282,7 +282,3 @@ int NiBSplineCompTransformInterpolator::GetNumControlPt() const
    }
    return 0;
 }
-
-const Type & NiBSplineCompTransformInterpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBSplineData.cpp b/src/obj/NiBSplineData.cpp
index 65b133fbc9e470c1e0cf6d1ee50c0b5869a8920b..a5b8a27cc61be5d2c7993b772a0c82d1df32e7a2 100644
--- a/src/obj/NiBSplineData.cpp
+++ b/src/obj/NiBSplineData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBSplineData::TYPE("NiBSplineData", &NI_B_SPLINE_DATA_PARENT::TypeConst() );
+const Type NiBSplineData::TYPE("NiBSplineData", &NI_B_SPLINE_DATA_PARENT::TYPE );
 
 NiBSplineData::NiBSplineData() NI_B_SPLINE_DATA_CONSTRUCT {}
 
@@ -50,7 +50,3 @@ vector<short > NiBSplineData::GetControlPointRange(int offset, int count) const
    std::advance(srcend, offset + count);
    return vector<short>(srcbeg, srcend);
 }
-
-const Type & NiBSplineData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBSplineInterpolator.cpp b/src/obj/NiBSplineInterpolator.cpp
index 5f0b9aa78ba7503a3ae76aea61a74afea2a4088d..95b1d68dae4aa72415fd1ccc9a696c34a1438c8c 100644
--- a/src/obj/NiBSplineInterpolator.cpp
+++ b/src/obj/NiBSplineInterpolator.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBSplineInterpolator::TYPE("NiBSplineInterpolator", &NI_B_SPLINE_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiBSplineInterpolator::TYPE("NiBSplineInterpolator", &NI_B_SPLINE_INTERPOLATOR_PARENT::TYPE );
 
 NiBSplineInterpolator::NiBSplineInterpolator() NI_B_SPLINE_INTERPOLATOR_CONSTRUCT {}
 
@@ -167,7 +167,3 @@ void NiBSplineInterpolator::bspline(int n, int t, int l, float *control, float *
    delete [] u;
    delete [] calc;
 }
-
-const Type & NiBSplineInterpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBillboardNode.cpp b/src/obj/NiBillboardNode.cpp
index 10a784f5c81a6b38dd711958e81f5bfdf4723117..438fce324d5a3f18329b0360d81932cc97cfcc19 100644
--- a/src/obj/NiBillboardNode.cpp
+++ b/src/obj/NiBillboardNode.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBillboardNode::TYPE("NiBillboardNode", &NI_BILLBOARD_NODE_PARENT::TypeConst() );
+const Type NiBillboardNode::TYPE("NiBillboardNode", &NI_BILLBOARD_NODE_PARENT::TYPE );
 
 NiBillboardNode::NiBillboardNode() NI_BILLBOARD_NODE_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ BillboardMode NiBillboardNode::GetBillboardMode() const {
 void NiBillboardNode::SetBillboardMode( BillboardMode value ) {
 	billboardMode = value;
 }
-
-const Type & NiBillboardNode::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBinaryExtraData.cpp b/src/obj/NiBinaryExtraData.cpp
index 7a129593360791fb292ca08ae2763f13718ed697..8d7bf168c2c51bce5a31cc069190b2b05bf7dbca 100644
--- a/src/obj/NiBinaryExtraData.cpp
+++ b/src/obj/NiBinaryExtraData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBinaryExtraData::TYPE("NiBinaryExtraData", &NI_BINARY_EXTRA_DATA_PARENT::TypeConst() );
+const Type NiBinaryExtraData::TYPE("NiBinaryExtraData", &NI_BINARY_EXTRA_DATA_PARENT::TYPE );
 
 NiBinaryExtraData::NiBinaryExtraData() NI_BINARY_EXTRA_DATA_CONSTRUCT {}
 
@@ -45,7 +45,3 @@ void NiBinaryExtraData::SetData( const vector<byte> & n ) {
 	binaryData.dataSize = (unsigned int)(n.size());
 	binaryData.data = n;
 };
-
-const Type & NiBinaryExtraData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBlendBoolInterpolator.cpp b/src/obj/NiBlendBoolInterpolator.cpp
index 51b4975dfe0143bdc62adb695e806fabc40c0e70..c08f8a4f3a98090142de1795322a503b963ccfc7 100644
--- a/src/obj/NiBlendBoolInterpolator.cpp
+++ b/src/obj/NiBlendBoolInterpolator.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBlendBoolInterpolator::TYPE("NiBlendBoolInterpolator", &NI_BLEND_BOOL_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiBlendBoolInterpolator::TYPE("NiBlendBoolInterpolator", &NI_BLEND_BOOL_INTERPOLATOR_PARENT::TYPE );
 
 NiBlendBoolInterpolator::NiBlendBoolInterpolator() NI_BLEND_BOOL_INTERPOLATOR_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ byte NiBlendBoolInterpolator::GetBoolValue() const {
 void NiBlendBoolInterpolator::SetBoolValue( byte value ) {
 	boolValue = value;
 }
-
-const Type & NiBlendBoolInterpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBlendFloatInterpolator.cpp b/src/obj/NiBlendFloatInterpolator.cpp
index 2b608a281bad79e42ad5af416090e87260058470..5baefbca7b3111eb2a4f88b5888db7e10cdbcbbd 100644
--- a/src/obj/NiBlendFloatInterpolator.cpp
+++ b/src/obj/NiBlendFloatInterpolator.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBlendFloatInterpolator::TYPE("NiBlendFloatInterpolator", &NI_BLEND_FLOAT_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiBlendFloatInterpolator::TYPE("NiBlendFloatInterpolator", &NI_BLEND_FLOAT_INTERPOLATOR_PARENT::TYPE );
 
 NiBlendFloatInterpolator::NiBlendFloatInterpolator() NI_BLEND_FLOAT_INTERPOLATOR_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ float NiBlendFloatInterpolator::GetFloatValue() const {
 void NiBlendFloatInterpolator::SetFloatValue( float value ) {
 	floatValue = value;
 }
-
-const Type & NiBlendFloatInterpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBlendInterpolator.cpp b/src/obj/NiBlendInterpolator.cpp
index 7db942c4da3a4bcfca00771d516a6bd96ab69754..febaf5a9e769e296d4b037996785d080fd2ede81 100644
--- a/src/obj/NiBlendInterpolator.cpp
+++ b/src/obj/NiBlendInterpolator.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBlendInterpolator::TYPE("NiBlendInterpolator", &NI_BLEND_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiBlendInterpolator::TYPE("NiBlendInterpolator", &NI_BLEND_INTERPOLATOR_PARENT::TYPE );
 
 NiBlendInterpolator::NiBlendInterpolator() NI_BLEND_INTERPOLATOR_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiBlendInterpolator::GetRefs() const {
 const Type & NiBlendInterpolator::GetType() const {
 	return TYPE;
 };
-
-const Type & NiBlendInterpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBlendPoint3Interpolator.cpp b/src/obj/NiBlendPoint3Interpolator.cpp
index 39002a95beeb036ee8ce6b15ede3194619c6a08d..46685c4cc341a0c51b58df7bc8850b165c86794a 100644
--- a/src/obj/NiBlendPoint3Interpolator.cpp
+++ b/src/obj/NiBlendPoint3Interpolator.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBlendPoint3Interpolator::TYPE("NiBlendPoint3Interpolator", &NI_BLEND_POINT3_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiBlendPoint3Interpolator::TYPE("NiBlendPoint3Interpolator", &NI_BLEND_POINT3_INTERPOLATOR_PARENT::TYPE );
 
 NiBlendPoint3Interpolator::NiBlendPoint3Interpolator() NI_BLEND_POINT3_INTERPOLATOR_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ Vector3 NiBlendPoint3Interpolator::GetPointValue() const {
 void NiBlendPoint3Interpolator::SetPointValue( Vector3 value ) {
 	pointValue = value;
 }
-
-const Type & NiBlendPoint3Interpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBlendTransformInterpolator.cpp b/src/obj/NiBlendTransformInterpolator.cpp
index 9593c6e60b4c55104f2fb19ef25742b2da8d1127..057aa0fccbede5e6e5020e0e7679794cdd31526a 100644
--- a/src/obj/NiBlendTransformInterpolator.cpp
+++ b/src/obj/NiBlendTransformInterpolator.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBlendTransformInterpolator::TYPE("NiBlendTransformInterpolator", &NI_BLEND_TRANSFORM_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiBlendTransformInterpolator::TYPE("NiBlendTransformInterpolator", &NI_BLEND_TRANSFORM_INTERPOLATOR_PARENT::TYPE );
 
 NiBlendTransformInterpolator::NiBlendTransformInterpolator() NI_BLEND_TRANSFORM_INTERPOLATOR_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiBlendTransformInterpolator::GetRefs() const {
 const Type & NiBlendTransformInterpolator::GetType() const {
 	return TYPE;
 };
-
-const Type & NiBlendTransformInterpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBoneLODController.cpp b/src/obj/NiBoneLODController.cpp
index 7b07d74637e1c4f757883427e1d017d464039c1a..c8a64d59af554eb6af6d5d2ab3afeef9659ee21f 100644
--- a/src/obj/NiBoneLODController.cpp
+++ b/src/obj/NiBoneLODController.cpp
@@ -9,7 +9,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBoneLODController::TYPE("NiBoneLODController", &NI_BONE_L_O_D_CONTROLLER_PARENT::TypeConst() );
+const Type NiBoneLODController::TYPE("NiBoneLODController", &NI_BONE_L_O_D_CONTROLLER_PARENT::TYPE );
 
 NiBoneLODController::NiBoneLODController() NI_BONE_L_O_D_CONTROLLER_CONSTRUCT {}
 
@@ -38,7 +38,3 @@ list<NiObjectRef> NiBoneLODController::GetRefs() const {
 const Type & NiBoneLODController::GetType() const {
 	return TYPE;
 };
-
-const Type & NiBoneLODController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBoolData.cpp b/src/obj/NiBoolData.cpp
index 35b6c7ce498d0b143db99ff2d5c11254e34ffd11..eaf1d66fbf2411e38f4959165ad15abb02dff3a2 100644
--- a/src/obj/NiBoolData.cpp
+++ b/src/obj/NiBoolData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBoolData::TYPE("NiBoolData", &NI_BOOL_DATA_PARENT::TypeConst() );
+const Type NiBoolData::TYPE("NiBoolData", &NI_BOOL_DATA_PARENT::TYPE );
 
 NiBoolData::NiBoolData() NI_BOOL_DATA_CONSTRUCT {}
 
@@ -51,7 +51,3 @@ vector< Key<unsigned char> > NiBoolData::GetKeys() const {
 void NiBoolData::SetKeys( vector< Key<unsigned char> > const & keys ) {
 	data.keys = keys;
 }
-
-const Type & NiBoolData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBoolInterpolator.cpp b/src/obj/NiBoolInterpolator.cpp
index b0b63b457308f47635ab76d7a77488a82898125b..ace48762258910c1dadfcd1be93fc4239ccfef18 100644
--- a/src/obj/NiBoolInterpolator.cpp
+++ b/src/obj/NiBoolInterpolator.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBoolInterpolator::TYPE("NiBoolInterpolator", &NI_BOOL_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiBoolInterpolator::TYPE("NiBoolInterpolator", &NI_BOOL_INTERPOLATOR_PARENT::TYPE );
 
 NiBoolInterpolator::NiBoolInterpolator() NI_BOOL_INTERPOLATOR_CONSTRUCT {}
 
@@ -51,7 +51,3 @@ Ref<NiBoolData > NiBoolInterpolator::GetData() const {
 void NiBoolInterpolator::SetData( NiBoolData * value ) {
 	data = value;
 }
-
-const Type & NiBoolInterpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBoolTimelineInterpolator.cpp b/src/obj/NiBoolTimelineInterpolator.cpp
index 24731e9005d53bc28dcbb6924f68cf10742b3407..684cb2464cd80ecd08cf8fb67f1897ef8e972c35 100644
--- a/src/obj/NiBoolTimelineInterpolator.cpp
+++ b/src/obj/NiBoolTimelineInterpolator.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBoolTimelineInterpolator::TYPE("NiBoolTimelineInterpolator", &NI_BOOL_TIMELINE_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiBoolTimelineInterpolator::TYPE("NiBoolTimelineInterpolator", &NI_BOOL_TIMELINE_INTERPOLATOR_PARENT::TYPE );
 
 NiBoolTimelineInterpolator::NiBoolTimelineInterpolator() NI_BOOL_TIMELINE_INTERPOLATOR_CONSTRUCT {}
 
@@ -51,7 +51,3 @@ Ref<NiBoolData> NiBoolTimelineInterpolator::GetData() const {
 void NiBoolTimelineInterpolator::SetData( NiBoolData * value ) {
 	data = value;
 }
-
-const Type & NiBoolTimelineInterpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiBooleanExtraData.cpp b/src/obj/NiBooleanExtraData.cpp
index 66115c9238850e21515f2c760730c9a78c6ac490..df39e0428eaf0ccf031324be62ed237cb872e02f 100644
--- a/src/obj/NiBooleanExtraData.cpp
+++ b/src/obj/NiBooleanExtraData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiBooleanExtraData::TYPE("NiBooleanExtraData", &NI_BOOLEAN_EXTRA_DATA_PARENT::TypeConst() );
+const Type NiBooleanExtraData::TYPE("NiBooleanExtraData", &NI_BOOLEAN_EXTRA_DATA_PARENT::TYPE );
 
 NiBooleanExtraData::NiBooleanExtraData() NI_BOOLEAN_EXTRA_DATA_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ bool NiBooleanExtraData::GetData() const {
 void NiBooleanExtraData::SetData( bool n ) {
 	booleanData = n;
 }
-
-const Type & NiBooleanExtraData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiCamera.cpp b/src/obj/NiCamera.cpp
index fabc19ed404235c5333fcb905143dad60a957088..83eeee154f40187f0da66d8fdc9298b60cd39d2c 100644
--- a/src/obj/NiCamera.cpp
+++ b/src/obj/NiCamera.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiCamera::TYPE("NiCamera", &NI_CAMERA_PARENT::TypeConst() );
+const Type NiCamera::TYPE("NiCamera", &NI_CAMERA_PARENT::TYPE );
 
 NiCamera::NiCamera() NI_CAMERA_CONSTRUCT {}
 
@@ -131,7 +131,3 @@ float NiCamera::GetLodAdjust() const {
 void NiCamera::SetLodAdjust( float value ) {
 	lodAdjust = value;
 }
-
-const Type & NiCamera::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiClod.cpp b/src/obj/NiClod.cpp
index b298d99a9136007fce65186148da856a6b753c7a..fc1c82f2987e9143671ebd92cee4007c6a1e82a7 100644
--- a/src/obj/NiClod.cpp
+++ b/src/obj/NiClod.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiClod::TYPE("NiClod", &NI_CLOD_PARENT::TypeConst() );
+const Type NiClod::TYPE("NiClod", &NI_CLOD_PARENT::TYPE );
 
 NiClod::NiClod() NI_CLOD_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiClod::GetRefs() const {
 const Type & NiClod::GetType() const {
 	return TYPE;
 };
-
-const Type & NiClod::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiClodData.cpp b/src/obj/NiClodData.cpp
index dac526276ce32df593ec5f78ffb1683c98730bbb..9dc33489b79517006b2b9945143277c6b441ccab 100644
--- a/src/obj/NiClodData.cpp
+++ b/src/obj/NiClodData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiClodData::TYPE("NiClodData", &NI_CLOD_DATA_PARENT::TypeConst() );
+const Type NiClodData::TYPE("NiClodData", &NI_CLOD_DATA_PARENT::TYPE );
 
 NiClodData::NiClodData() NI_CLOD_DATA_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiClodData::GetRefs() const {
 const Type & NiClodData::GetType() const {
 	return TYPE;
 };
-
-const Type & NiClodData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiClodSkinInstance.cpp b/src/obj/NiClodSkinInstance.cpp
index 2664fbc45cdfd10841625030bbf23aae3b12d731..5aad23b1c048b1f7dc244595c57ba4fd8d9e62a1 100644
--- a/src/obj/NiClodSkinInstance.cpp
+++ b/src/obj/NiClodSkinInstance.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiClodSkinInstance::TYPE("NiClodSkinInstance", &NI_CLOD_SKIN_INSTANCE_PARENT::TypeConst() );
+const Type NiClodSkinInstance::TYPE("NiClodSkinInstance", &NI_CLOD_SKIN_INSTANCE_PARENT::TYPE );
 
 NiClodSkinInstance::NiClodSkinInstance() NI_CLOD_SKIN_INSTANCE_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiClodSkinInstance::GetRefs() const {
 const Type & NiClodSkinInstance::GetType() const {
 	return TYPE;
 };
-
-const Type & NiClodSkinInstance::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiCollisionData.cpp b/src/obj/NiCollisionData.cpp
index c688d30652eb25810dadc527c32884d282234251..67c0ecc213f049acb6d06437e5da2eb10302167f 100644
--- a/src/obj/NiCollisionData.cpp
+++ b/src/obj/NiCollisionData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiCollisionData::TYPE("NiCollisionData", &NI_COLLISION_DATA_PARENT::TypeConst() );
+const Type NiCollisionData::TYPE("NiCollisionData", &NI_COLLISION_DATA_PARENT::TYPE );
 
 NiCollisionData::NiCollisionData() NI_COLLISION_DATA_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiCollisionData::GetRefs() const {
 const Type & NiCollisionData::GetType() const {
 	return TYPE;
 };
-
-const Type & NiCollisionData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiCollisionObject.cpp b/src/obj/NiCollisionObject.cpp
index 8214223ea4a57da3f22125f715dd044c8b30b5d6..f8488a652a7fe6c8b0257d75aa2bfee9a6cbb97c 100644
--- a/src/obj/NiCollisionObject.cpp
+++ b/src/obj/NiCollisionObject.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiCollisionObject::TYPE("NiCollisionObject", &NI_COLLISION_OBJECT_PARENT::TypeConst() );
+const Type NiCollisionObject::TYPE("NiCollisionObject", &NI_COLLISION_OBJECT_PARENT::TYPE );
 
 NiCollisionObject::NiCollisionObject() NI_COLLISION_OBJECT_CONSTRUCT {}
 
@@ -52,7 +52,3 @@ Ref<NiObject > NiCollisionObject::GetBody() const {
 void NiCollisionObject::SetBody( NiObject * value ) {
 	body = value;
 }
-
-const Type & NiCollisionObject::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiColorData.cpp b/src/obj/NiColorData.cpp
index 33d623723a62ebb429ad40695eec148b6484f358..4142b02e19f737970d715ad6ae63e194f5321f50 100644
--- a/src/obj/NiColorData.cpp
+++ b/src/obj/NiColorData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiColorData::TYPE("NiColorData", &NI_COLOR_DATA_PARENT::TypeConst() );
+const Type NiColorData::TYPE("NiColorData", &NI_COLOR_DATA_PARENT::TYPE );
 
 NiColorData::NiColorData() NI_COLOR_DATA_CONSTRUCT {}
 
@@ -51,7 +51,3 @@ vector< Key<Color4> > NiColorData::GetKeys() const {
 void NiColorData::SetKeys( vector< Key<Color4> > const & keys ) {
 	data.keys = keys;
 }
-
-const Type & NiColorData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiColorExtraData.cpp b/src/obj/NiColorExtraData.cpp
index 71d808c76631d5243002ab4f364482c46d00cb19..eb7b5eee3a37e35ad185e4bbc97bda13c32ff814 100644
--- a/src/obj/NiColorExtraData.cpp
+++ b/src/obj/NiColorExtraData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiColorExtraData::TYPE("NiColorExtraData", &NI_COLOR_EXTRA_DATA_PARENT::TypeConst() );
+const Type NiColorExtraData::TYPE("NiColorExtraData", &NI_COLOR_EXTRA_DATA_PARENT::TYPE );
 
 NiColorExtraData::NiColorExtraData() NI_COLOR_EXTRA_DATA_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ Color4 NiColorExtraData::GetData() const {
 void NiColorExtraData::SetData( const Color4 & n ) {
 	data = n;
 }
-
-const Type & NiColorExtraData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiControllerManager.cpp b/src/obj/NiControllerManager.cpp
index 31b02bbf36a322c32607b77c6db371d3c99a4649..4029ae5d3be1d9813a931b5d06fae74993573a40 100644
--- a/src/obj/NiControllerManager.cpp
+++ b/src/obj/NiControllerManager.cpp
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiControllerManager::TYPE("NiControllerManager", &NI_CONTROLLER_MANAGER_PARENT::TypeConst() );
+const Type NiControllerManager::TYPE("NiControllerManager", &NI_CONTROLLER_MANAGER_PARENT::TYPE );
 
 NiControllerManager::NiControllerManager() NI_CONTROLLER_MANAGER_CONSTRUCT {}
 
@@ -93,7 +93,3 @@ Ref<NiDefaultAVObjectPalette > NiControllerManager::GetObjectPalette() const {
 void NiControllerManager::SetObjectPalette( NiDefaultAVObjectPalette * value ) {
 	objectPalette = value;
 }
-
-const Type & NiControllerManager::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiControllerSequence.cpp b/src/obj/NiControllerSequence.cpp
index c0c88f0b92d6710d4b123ed15165463dd887c245..d531fb31029e32602aa2508a3b32f355736d55ba 100644
--- a/src/obj/NiControllerSequence.cpp
+++ b/src/obj/NiControllerSequence.cpp
@@ -17,7 +17,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiControllerSequence::TYPE("NiControllerSequence", &NI_CONTROLLER_SEQUENCE_PARENT::TypeConst() );
+const Type NiControllerSequence::TYPE("NiControllerSequence", &NI_CONTROLLER_SEQUENCE_PARENT::TYPE );
 
 NiControllerSequence::NiControllerSequence() NI_CONTROLLER_SEQUENCE_CONSTRUCT {}
 
@@ -223,7 +223,3 @@ float NiControllerSequence::GetWeight() const {
 void NiControllerSequence::SetWeight( const float value ) {
 	weight = value;
 }
-
-const Type & NiControllerSequence::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiDefaultAVObjectPalette.cpp b/src/obj/NiDefaultAVObjectPalette.cpp
index 1b8ede42de473910c834ad80201ff722fa86539e..f7ddb9e292fb302a43cba98f10cd94bdc3e2f659 100644
--- a/src/obj/NiDefaultAVObjectPalette.cpp
+++ b/src/obj/NiDefaultAVObjectPalette.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiDefaultAVObjectPalette::TYPE("NiDefaultAVObjectPalette", &NI_DEFAULT_A_V_OBJECT_PALETTE_PARENT::TypeConst() );
+const Type NiDefaultAVObjectPalette::TYPE("NiDefaultAVObjectPalette", &NI_DEFAULT_A_V_OBJECT_PALETTE_PARENT::TYPE );
 
 NiDefaultAVObjectPalette::NiDefaultAVObjectPalette() NI_DEFAULT_A_V_OBJECT_PALETTE_CONSTRUCT {}
 
@@ -54,7 +54,3 @@ void NiDefaultAVObjectPalette::SetObjs( const vector<Ref<NiAVObject> >& value )
       objs.push_back(obj);
    }
 }
-
-const Type & NiDefaultAVObjectPalette::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiDirectionalLight.cpp b/src/obj/NiDirectionalLight.cpp
index fb60079d00323ec920736a6c262de9ed48fd81f0..10b0ea8480d482d425558c147074298d71a1c63e 100644
--- a/src/obj/NiDirectionalLight.cpp
+++ b/src/obj/NiDirectionalLight.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiDirectionalLight::TYPE("NiDirectionalLight", &NI_DIRECTIONAL_LIGHT_PARENT::TypeConst() );
+const Type NiDirectionalLight::TYPE("NiDirectionalLight", &NI_DIRECTIONAL_LIGHT_PARENT::TYPE );
 
 NiDirectionalLight::NiDirectionalLight() NI_DIRECTIONAL_LIGHT_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiDirectionalLight::GetRefs() const {
 const Type & NiDirectionalLight::GetType() const {
 	return TYPE;
 };
-
-const Type & NiDirectionalLight::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiDitherProperty.cpp b/src/obj/NiDitherProperty.cpp
index 02011a99b84bb3de505855f172eb2d01bd9d8de4..d1e1de36300d83b2598694625faf928483d4c225 100644
--- a/src/obj/NiDitherProperty.cpp
+++ b/src/obj/NiDitherProperty.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiDitherProperty::TYPE("NiDitherProperty", &NI_DITHER_PROPERTY_PARENT::TypeConst() );
+const Type NiDitherProperty::TYPE("NiDitherProperty", &NI_DITHER_PROPERTY_PARENT::TYPE );
 
 NiDitherProperty::NiDitherProperty() NI_DITHER_PROPERTY_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ unsigned short NiDitherProperty::GetFlags() const {
 void NiDitherProperty::SetFlags( unsigned short n ) {
    flags = n;
 }
-
-const Type & NiDitherProperty::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiDynamicEffect.cpp b/src/obj/NiDynamicEffect.cpp
index 89ff11caa284ab2d958cc699282b4f68d3e3d7b1..dda7d991d2f789a720b3bd929648199c2a9e835a 100644
--- a/src/obj/NiDynamicEffect.cpp
+++ b/src/obj/NiDynamicEffect.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiDynamicEffect::TYPE("NiDynamicEffect", &NI_DYNAMIC_EFFECT_PARENT::TypeConst() );
+const Type NiDynamicEffect::TYPE("NiDynamicEffect", &NI_DYNAMIC_EFFECT_PARENT::TYPE );
 
 NiDynamicEffect::NiDynamicEffect() NI_DYNAMIC_EFFECT_CONSTRUCT {}
 
@@ -51,7 +51,3 @@ vector<Ref<NiAVObject > > NiDynamicEffect::GetAffectedNodes() const {
 void NiDynamicEffect::SetAffectedNodes( const vector<Ref<NiAVObject > >& value ) {
 	affectedNodes = value;
 }
-
-const Type & NiDynamicEffect::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiExtraData.cpp b/src/obj/NiExtraData.cpp
index e88fdb84ef3844044fab823e4fe723e3b319c14b..689f8b5046aef5f8c94199f284ece8895d6d8adb 100644
--- a/src/obj/NiExtraData.cpp
+++ b/src/obj/NiExtraData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiExtraData::TYPE("NiExtraData", &NI_EXTRA_DATA_PARENT::TypeConst() );
+const Type NiExtraData::TYPE("NiExtraData", &NI_EXTRA_DATA_PARENT::TYPE );
 
 NiExtraData::NiExtraData() NI_EXTRA_DATA_CONSTRUCT {}
 
@@ -57,7 +57,3 @@ NiExtraDataRef NiExtraData::GetNextExtraData() const {
 void NiExtraData::SetNextExtraData( NiExtraData * obj ) {
 	nextExtraData = obj;
 }
-
-const Type & NiExtraData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiFlipController.cpp b/src/obj/NiFlipController.cpp
index c679abe99e0010f079435e34377d2aac7f4af09d..9acbb95f36fcfd16150ebf673859a7eaa15ed63c 100644
--- a/src/obj/NiFlipController.cpp
+++ b/src/obj/NiFlipController.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiFlipController::TYPE("NiFlipController", &NI_FLIP_CONTROLLER_PARENT::TypeConst() );
+const Type NiFlipController::TYPE("NiFlipController", &NI_FLIP_CONTROLLER_PARENT::TYPE );
 
 NiFlipController::NiFlipController() NI_FLIP_CONTROLLER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiFlipController::GetRefs() const {
 const Type & NiFlipController::GetType() const {
 	return TYPE;
 };
-
-const Type & NiFlipController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiFloatData.cpp b/src/obj/NiFloatData.cpp
index 4caf8a97dec8b6148b3045d34320ac55c81c81ec..436296b36428b3b671608d95525e341d6d3324cc 100644
--- a/src/obj/NiFloatData.cpp
+++ b/src/obj/NiFloatData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiFloatData::TYPE("NiFloatData", &NI_FLOAT_DATA_PARENT::TypeConst() );
+const Type NiFloatData::TYPE("NiFloatData", &NI_FLOAT_DATA_PARENT::TYPE );
 
 NiFloatData::NiFloatData() NI_FLOAT_DATA_CONSTRUCT {}
 
@@ -51,7 +51,3 @@ vector< Key<float> > NiFloatData::GetKeys() const {
 void NiFloatData::SetKeys( vector< Key<float> > const & keys ) {
 	data.keys = keys;
 }
-
-const Type & NiFloatData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiFloatExtraData.cpp b/src/obj/NiFloatExtraData.cpp
index 4500b9f16f8a461ca163e8e6a46bf7db5330b573..92e9a28342dafb0e1f740dbd010cce18b76ddf4b 100644
--- a/src/obj/NiFloatExtraData.cpp
+++ b/src/obj/NiFloatExtraData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiFloatExtraData::TYPE("NiFloatExtraData", &NI_FLOAT_EXTRA_DATA_PARENT::TypeConst() );
+const Type NiFloatExtraData::TYPE("NiFloatExtraData", &NI_FLOAT_EXTRA_DATA_PARENT::TYPE );
 
 NiFloatExtraData::NiFloatExtraData() NI_FLOAT_EXTRA_DATA_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ float NiFloatExtraData::GetData() const {
 void NiFloatExtraData::SetData( float n ) {
 	floatData = n;
 }
-
-const Type & NiFloatExtraData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiFloatExtraDataController.cpp b/src/obj/NiFloatExtraDataController.cpp
index d0fd9c0f0ecaa69fa9d3c73aae21bee470668ac6..75ef2387d2d546b22b4d6b1528a6f2ece7479daa 100644
--- a/src/obj/NiFloatExtraDataController.cpp
+++ b/src/obj/NiFloatExtraDataController.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiFloatExtraDataController::TYPE("NiFloatExtraDataController", &NI_FLOAT_EXTRA_DATA_CONTROLLER_PARENT::TypeConst() );
+const Type NiFloatExtraDataController::TYPE("NiFloatExtraDataController", &NI_FLOAT_EXTRA_DATA_CONTROLLER_PARENT::TYPE );
 
 NiFloatExtraDataController::NiFloatExtraDataController() NI_FLOAT_EXTRA_DATA_CONTROLLER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiFloatExtraDataController::GetRefs() const {
 const Type & NiFloatExtraDataController::GetType() const {
 	return TYPE;
 };
-
-const Type & NiFloatExtraDataController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiFloatInterpolator.cpp b/src/obj/NiFloatInterpolator.cpp
index b606b562e590c003b0c9457478c28bb6de795007..84ebe777569f6517b830c2ebe4625eafa99ddfcd 100644
--- a/src/obj/NiFloatInterpolator.cpp
+++ b/src/obj/NiFloatInterpolator.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiFloatInterpolator::TYPE("NiFloatInterpolator", &NI_FLOAT_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiFloatInterpolator::TYPE("NiFloatInterpolator", &NI_FLOAT_INTERPOLATOR_PARENT::TYPE );
 
 NiFloatInterpolator::NiFloatInterpolator() NI_FLOAT_INTERPOLATOR_CONSTRUCT {}
 
@@ -51,7 +51,3 @@ Ref<NiFloatData > NiFloatInterpolator::GetData() const {
 void NiFloatInterpolator::SetData( NiFloatData * value ) {
 	data = value;
 }
-
-const Type & NiFloatInterpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiFloatsExtraData.cpp b/src/obj/NiFloatsExtraData.cpp
index 9dfae4209dcb16893cbfa65c9d56c8efb4e8f6ba..6371ac37e1e3bceea69c67ab3c1d8b93d55272b7 100644
--- a/src/obj/NiFloatsExtraData.cpp
+++ b/src/obj/NiFloatsExtraData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiFloatsExtraData::TYPE("NiFloatsExtraData", &NI_FLOATS_EXTRA_DATA_PARENT::TypeConst() );
+const Type NiFloatsExtraData::TYPE("NiFloatsExtraData", &NI_FLOATS_EXTRA_DATA_PARENT::TYPE );
 
 NiFloatsExtraData::NiFloatsExtraData() NI_FLOATS_EXTRA_DATA_CONSTRUCT {}
 
@@ -43,7 +43,3 @@ void NiFloatsExtraData::SetData( const vector<float> & n ) {
 	numFloats = (unsigned int)(n.size());
 	data = n;
 }
-
-const Type & NiFloatsExtraData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiFogProperty.cpp b/src/obj/NiFogProperty.cpp
index 4692fe31e90398624bb2d00a6f90b94d772029da..bd8515863822fb63d39668fa9a0180dc68f5eda7 100644
--- a/src/obj/NiFogProperty.cpp
+++ b/src/obj/NiFogProperty.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiFogProperty::TYPE("NiFogProperty", &NI_FOG_PROPERTY_PARENT::TypeConst() );
+const Type NiFogProperty::TYPE("NiFogProperty", &NI_FOG_PROPERTY_PARENT::TYPE );
 
 NiFogProperty::NiFogProperty() NI_FOG_PROPERTY_CONSTRUCT {}
 
@@ -59,7 +59,3 @@ Color3 NiFogProperty::GetFogColor() const {
 void NiFogProperty::SetFogColor(Color3 value) {
    fogColor = value;
 }
-
-const Type & NiFogProperty::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiGeomMorpherController.cpp b/src/obj/NiGeomMorpherController.cpp
index 49b7550229c7f3f10d8b0ca1957cb50555d2a877..872041b5bb8108f18a058320a088b7e38da24917 100644
--- a/src/obj/NiGeomMorpherController.cpp
+++ b/src/obj/NiGeomMorpherController.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiGeomMorpherController::TYPE("NiGeomMorpherController", &NI_GEOM_MORPHER_CONTROLLER_PARENT::TypeConst() );
+const Type NiGeomMorpherController::TYPE("NiGeomMorpherController", &NI_GEOM_MORPHER_CONTROLLER_PARENT::TYPE );
 
 NiGeomMorpherController::NiGeomMorpherController() NI_GEOM_MORPHER_CONTROLLER_CONSTRUCT {}
 
@@ -53,7 +53,3 @@ Ref<NiMorphData> NiGeomMorpherController::GetData() const {
 void NiGeomMorpherController::SetData( NiMorphData * n ) {
 	data = n;
 }
-
-const Type & NiGeomMorpherController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiGeometry.cpp b/src/obj/NiGeometry.cpp
index 160eed526f484321d42836e2dc2bec6b493a3580..1577f418f4a7b2902242ba75008988ce9a0afe0a 100644
--- a/src/obj/NiGeometry.cpp
+++ b/src/obj/NiGeometry.cpp
@@ -11,7 +11,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiGeometry::TYPE("NiGeometry", &NI_GEOMETRY_PARENT::TypeConst() );
+const Type NiGeometry::TYPE("NiGeometry", &NI_GEOMETRY_PARENT::TYPE );
 
 NiGeometry::NiGeometry() NI_GEOMETRY_CONSTRUCT {}
 
@@ -362,7 +362,3 @@ void NiGeometry::SetBoneWeights( unsigned int bone_index, const vector<SkinWeigh
 
 	skinData->SetBoneWeights( bone_index, n, center, radius );
 }
-
-const Type & NiGeometry::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiGeometryData.cpp b/src/obj/NiGeometryData.cpp
index 875394ff3fae6991555d461673f43a929ed3ee6d..852ed168af253d9832b8a50580f485f2d109e56c 100644
--- a/src/obj/NiGeometryData.cpp
+++ b/src/obj/NiGeometryData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiGeometryData::TYPE("NiGeometryData", &NI_GEOMETRY_DATA_PARENT::TypeConst() );
+const Type NiGeometryData::TYPE("NiGeometryData", &NI_GEOMETRY_DATA_PARENT::TYPE );
 
 NiGeometryData::NiGeometryData() NI_GEOMETRY_DATA_CONSTRUCT {}
 
@@ -162,7 +162,3 @@ void NiGeometryData::Transform( const Matrix44 & transform ) {
 		normals[i] = rotation * normals[i];
 	}
 }
-
-const Type & NiGeometryData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiGravity.cpp b/src/obj/NiGravity.cpp
index 6bb76d425abc79874c35fef3486504ad6ad4576a..3185e3ba873dee2f7dcfdc910c9fabf278ef4a5b 100644
--- a/src/obj/NiGravity.cpp
+++ b/src/obj/NiGravity.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiGravity::TYPE("NiGravity", &NI_GRAVITY_PARENT::TypeConst() );
+const Type NiGravity::TYPE("NiGravity", &NI_GRAVITY_PARENT::TYPE );
 
 NiGravity::NiGravity() NI_GRAVITY_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiGravity::GetRefs() const {
 const Type & NiGravity::GetType() const {
 	return TYPE;
 };
-
-const Type & NiGravity::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiImage.cpp b/src/obj/NiImage.cpp
index ee9f0ce790db544853e761f33e58de4a7b927490..8d14b9f5a2051d18e1670a5520469b8e75db0efa 100644
--- a/src/obj/NiImage.cpp
+++ b/src/obj/NiImage.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiImage::TYPE("NiImage", &NI_IMAGE_PARENT::TypeConst() );
+const Type NiImage::TYPE("NiImage", &NI_IMAGE_PARENT::TYPE );
 
 NiImage::NiImage() NI_IMAGE_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiImage::GetRefs() const {
 const Type & NiImage::GetType() const {
 	return TYPE;
 };
-
-const Type & NiImage::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiIntegerExtraData.cpp b/src/obj/NiIntegerExtraData.cpp
index d94fbe8a15865b7a219ee72c8bb87fe64d2368e1..2dfb9845370b5c8fdfbcfb3df14d76bfd92a4898 100644
--- a/src/obj/NiIntegerExtraData.cpp
+++ b/src/obj/NiIntegerExtraData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiIntegerExtraData::TYPE("NiIntegerExtraData", &NI_INTEGER_EXTRA_DATA_PARENT::TypeConst() );
+const Type NiIntegerExtraData::TYPE("NiIntegerExtraData", &NI_INTEGER_EXTRA_DATA_PARENT::TYPE );
 
 NiIntegerExtraData::NiIntegerExtraData() NI_INTEGER_EXTRA_DATA_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ unsigned int NiIntegerExtraData::GetData() const {
 void NiIntegerExtraData::SetData( unsigned int n ) {
 	integerData = n;
 }
-
-const Type & NiIntegerExtraData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiIntegersExtraData.cpp b/src/obj/NiIntegersExtraData.cpp
index 79804cc47a9ee2a7703c7af5857487a571e3657d..2e131b0376d83996e851c160a15560c4fbec52aa 100644
--- a/src/obj/NiIntegersExtraData.cpp
+++ b/src/obj/NiIntegersExtraData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiIntegersExtraData::TYPE("NiIntegersExtraData", &NI_INTEGERS_EXTRA_DATA_PARENT::TypeConst() );
+const Type NiIntegersExtraData::TYPE("NiIntegersExtraData", &NI_INTEGERS_EXTRA_DATA_PARENT::TYPE );
 
 NiIntegersExtraData::NiIntegersExtraData() NI_INTEGERS_EXTRA_DATA_CONSTRUCT {}
 
@@ -43,7 +43,3 @@ void NiIntegersExtraData::SetData( const vector<unsigned int> & n ) {
 	numIntegers = (unsigned int)( n.size() );
 	data = n;
 };
-
-const Type & NiIntegersExtraData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiInterpolator.cpp b/src/obj/NiInterpolator.cpp
index 94fd4029b2329163022b76cde0a40f0ca2bd088c..d8efbb5cb21bf4067155e3a2499502e619318af3 100644
--- a/src/obj/NiInterpolator.cpp
+++ b/src/obj/NiInterpolator.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiInterpolator::TYPE("NiInterpolator", &NI_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiInterpolator::TYPE("NiInterpolator", &NI_INTERPOLATOR_PARENT::TYPE );
 
 NiInterpolator::NiInterpolator() NI_INTERPOLATOR_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiInterpolator::GetRefs() const {
 const Type & NiInterpolator::GetType() const {
 	return TYPE;
 };
-
-const Type & NiInterpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiKeyframeController.cpp b/src/obj/NiKeyframeController.cpp
index bff3f4c2ef58cf84fd525e4ed1cd258bc7d2f1ff..c889ddb3ebc66336166bf313707dca54348d29ce 100644
--- a/src/obj/NiKeyframeController.cpp
+++ b/src/obj/NiKeyframeController.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiKeyframeController::TYPE("NiKeyframeController", &NI_KEYFRAME_CONTROLLER_PARENT::TypeConst() );
+const Type NiKeyframeController::TYPE("NiKeyframeController", &NI_KEYFRAME_CONTROLLER_PARENT::TYPE );
 
 NiKeyframeController::NiKeyframeController() NI_KEYFRAME_CONTROLLER_CONSTRUCT {}
 
@@ -43,7 +43,3 @@ Ref<NiKeyframeData> NiKeyframeController::GetData() const {
 void NiKeyframeController::SetData( NiKeyframeData * n ) {
 	data = n;
 }
-
-const Type & NiKeyframeController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiKeyframeData.cpp b/src/obj/NiKeyframeData.cpp
index d6348b3ab05d3ce6ab893fc48875fe657e6ef2d5..8bdf6e1f50bcee88e338c6d2f1d960811438de15 100644
--- a/src/obj/NiKeyframeData.cpp
+++ b/src/obj/NiKeyframeData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiKeyframeData::TYPE("NiKeyframeData", &NI_KEYFRAME_DATA_PARENT::TypeConst() );
+const Type NiKeyframeData::TYPE("NiKeyframeData", &NI_KEYFRAME_DATA_PARENT::TYPE );
 
 NiKeyframeData::NiKeyframeData() NI_KEYFRAME_DATA_CONSTRUCT {}
 
@@ -141,7 +141,3 @@ vector< Key<float> > NiKeyframeData::GetScaleKeys() const {
 void NiKeyframeData::SetScaleKeys( vector< Key<float> > const & keys ) {
 	scales.keys = keys;
 }
-
-const Type & NiKeyframeData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiLODData.cpp b/src/obj/NiLODData.cpp
index 6e0b6a7614e61ad823b7d1ad996fd39bbb0faff4..022f3fe4509cafe57d8cf330babbd672c918f888 100644
--- a/src/obj/NiLODData.cpp
+++ b/src/obj/NiLODData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiLODData::TYPE("NiLODData", &NI_L_O_D_DATA_PARENT::TypeConst() );
+const Type NiLODData::TYPE("NiLODData", &NI_L_O_D_DATA_PARENT::TYPE );
 
 NiLODData::NiLODData() NI_L_O_D_DATA_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiLODData::GetRefs() const {
 const Type & NiLODData::GetType() const {
 	return TYPE;
 };
-
-const Type & NiLODData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiLODNode.cpp b/src/obj/NiLODNode.cpp
index a8a0f0c669c587484d0ac1d56dd97190f37a5d26..12ac8a6be15b6d689990568d2e3536903d4d29fa 100644
--- a/src/obj/NiLODNode.cpp
+++ b/src/obj/NiLODNode.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiLODNode::TYPE("NiLODNode", &NI_L_O_D_NODE_PARENT::TypeConst() );
+const Type NiLODNode::TYPE("NiLODNode", &NI_L_O_D_NODE_PARENT::TYPE );
 
 NiLODNode::NiLODNode() NI_L_O_D_NODE_CONSTRUCT {}
 
@@ -60,7 +60,3 @@ Ref<NiLODData > NiLODNode::GetLODLevelData() const {
 void NiLODNode::SetLODLevelData( Ref<NiLODData > value ) {
 	lodLevelData = value;
 }
-
-const Type & NiLODNode::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiLight.cpp b/src/obj/NiLight.cpp
index 1321e2aee1f2a1cd134319bd6b86bfaf293c3b3d..de7f056e0983d2c547415e812e89b4b6941ab0f6 100644
--- a/src/obj/NiLight.cpp
+++ b/src/obj/NiLight.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiLight::TYPE("NiLight", &NI_LIGHT_PARENT::TypeConst() );
+const Type NiLight::TYPE("NiLight", &NI_LIGHT_PARENT::TYPE );
 
 NiLight::NiLight() NI_LIGHT_CONSTRUCT {}
 
@@ -66,7 +66,3 @@ Color3 NiLight::GetSpecularColor() const {
 void NiLight::SetSpecularColor( Color3 value ) {
 	specularColor = value;
 }
-
-const Type & NiLight::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiLightColorController.cpp b/src/obj/NiLightColorController.cpp
index f2c49b7c165d8971006a6565d2baf647e36015ff..cf4e3e78b55b9e30aae25d0c7ccf4ac4514828e9 100644
--- a/src/obj/NiLightColorController.cpp
+++ b/src/obj/NiLightColorController.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiLightColorController::TYPE("NiLightColorController", &NI_LIGHT_COLOR_CONTROLLER_PARENT::TypeConst() );
+const Type NiLightColorController::TYPE("NiLightColorController", &NI_LIGHT_COLOR_CONTROLLER_PARENT::TYPE );
 
 NiLightColorController::NiLightColorController() NI_LIGHT_COLOR_CONTROLLER_CONSTRUCT {}
 
@@ -52,7 +52,3 @@ Ref<NiPoint3Interpolator > NiLightColorController::GetInterpolator() const {
 void NiLightColorController::SetInterpolator( NiPoint3Interpolator * value ) {
 	interpolator = value;
 }
-
-const Type & NiLightColorController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiLightDimmerController.cpp b/src/obj/NiLightDimmerController.cpp
index 2e021680d93266e87110c56845374477a0387843..7d1b77dc1e051f54d88a9b64c46ec455cda6c8a5 100644
--- a/src/obj/NiLightDimmerController.cpp
+++ b/src/obj/NiLightDimmerController.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiLightDimmerController::TYPE("NiLightDimmerController", &NI_LIGHT_DIMMER_CONTROLLER_PARENT::TypeConst() );
+const Type NiLightDimmerController::TYPE("NiLightDimmerController", &NI_LIGHT_DIMMER_CONTROLLER_PARENT::TYPE );
 
 NiLightDimmerController::NiLightDimmerController() NI_LIGHT_DIMMER_CONTROLLER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiLightDimmerController::GetRefs() const {
 const Type & NiLightDimmerController::GetType() const {
 	return TYPE;
 };
-
-const Type & NiLightDimmerController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiLookAtController.cpp b/src/obj/NiLookAtController.cpp
index 807c8ba814542eee95378d323bd9410a9d7863dd..17d0fc48c061fe22e72a7b074bfe733a7046a6cf 100644
--- a/src/obj/NiLookAtController.cpp
+++ b/src/obj/NiLookAtController.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiLookAtController::TYPE("NiLookAtController", &NI_LOOK_AT_CONTROLLER_PARENT::TypeConst() );
+const Type NiLookAtController::TYPE("NiLookAtController", &NI_LOOK_AT_CONTROLLER_PARENT::TYPE );
 
 NiLookAtController::NiLookAtController() NI_LOOK_AT_CONTROLLER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiLookAtController::GetRefs() const {
 const Type & NiLookAtController::GetType() const {
 	return TYPE;
 };
-
-const Type & NiLookAtController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiLookAtInterpolator.cpp b/src/obj/NiLookAtInterpolator.cpp
index 38000646e4f4fe7536e7c6b4bfd3edd60b588075..f056c64adeacc4c846a96bbbca3f07524bef59d0 100644
--- a/src/obj/NiLookAtInterpolator.cpp
+++ b/src/obj/NiLookAtInterpolator.cpp
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiLookAtInterpolator::TYPE("NiLookAtInterpolator", &NI_LOOK_AT_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiLookAtInterpolator::TYPE("NiLookAtInterpolator", &NI_LOOK_AT_INTERPOLATOR_PARENT::TYPE );
 
 NiLookAtInterpolator::NiLookAtInterpolator() NI_LOOK_AT_INTERPOLATOR_CONSTRUCT {}
 
@@ -69,7 +69,3 @@ float NiLookAtInterpolator::GetScale() const {
 void NiLookAtInterpolator::SetScale( float value ) {
 	scale = value;
 }
-
-const Type & NiLookAtInterpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiMaterialColorController.cpp b/src/obj/NiMaterialColorController.cpp
index 9261c5c5f2adcfd37445c983471c9b0f64d65440..f4dd83303e2a32fec51ac6ad82d12b2ae0d62866 100644
--- a/src/obj/NiMaterialColorController.cpp
+++ b/src/obj/NiMaterialColorController.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiMaterialColorController::TYPE("NiMaterialColorController", &NI_MATERIAL_COLOR_CONTROLLER_PARENT::TypeConst() );
+const Type NiMaterialColorController::TYPE("NiMaterialColorController", &NI_MATERIAL_COLOR_CONTROLLER_PARENT::TYPE );
 
 NiMaterialColorController::NiMaterialColorController() NI_MATERIAL_COLOR_CONTROLLER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiMaterialColorController::GetRefs() const {
 const Type & NiMaterialColorController::GetType() const {
 	return TYPE;
 };
-
-const Type & NiMaterialColorController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiMaterialProperty.cpp b/src/obj/NiMaterialProperty.cpp
index 2157e8fafac0296cbf521c9131d9e04de0bde1ef..66142652aaf043a6f41740e11392c42db719e22c 100644
--- a/src/obj/NiMaterialProperty.cpp
+++ b/src/obj/NiMaterialProperty.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiMaterialProperty::TYPE("NiMaterialProperty", &NI_MATERIAL_PROPERTY_PARENT::TypeConst() );
+const Type NiMaterialProperty::TYPE("NiMaterialProperty", &NI_MATERIAL_PROPERTY_PARENT::TYPE );
 
 NiMaterialProperty::NiMaterialProperty() NI_MATERIAL_PROPERTY_CONSTRUCT {}
 
@@ -90,7 +90,3 @@ Color3 NiMaterialProperty::GetSpecularColor() const {
 void NiMaterialProperty::SetSpecularColor( const Color3 & n ) {
 	specularColor = n;
 }
-
-const Type & NiMaterialProperty::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiMeshPSysData.cpp b/src/obj/NiMeshPSysData.cpp
index 613a9fe24509e17af0615d6f8bd8d4d06bb65011..9866b03c09bcbf660f4eaeca32a3a8ebaa127cc5 100644
--- a/src/obj/NiMeshPSysData.cpp
+++ b/src/obj/NiMeshPSysData.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiMeshPSysData::TYPE("NiMeshPSysData", &NI_MESH_P_SYS_DATA_PARENT::TypeConst() );
+const Type NiMeshPSysData::TYPE("NiMeshPSysData", &NI_MESH_P_SYS_DATA_PARENT::TYPE );
 
 NiMeshPSysData::NiMeshPSysData() NI_MESH_P_SYS_DATA_CONSTRUCT {}
 
@@ -36,7 +36,3 @@ list<NiObjectRef> NiMeshPSysData::GetRefs() const {
 const Type & NiMeshPSysData::GetType() const {
 	return TYPE;
 };
-
-const Type & NiMeshPSysData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiMeshParticleSystem.cpp b/src/obj/NiMeshParticleSystem.cpp
index 940cad9e3db520451865eebd0c721c0950778a59..2933f997b3d5948dc368b8d6a8abb67b02415f5b 100644
--- a/src/obj/NiMeshParticleSystem.cpp
+++ b/src/obj/NiMeshParticleSystem.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiMeshParticleSystem::TYPE("NiMeshParticleSystem", &NI_MESH_PARTICLE_SYSTEM_PARENT::TypeConst() );
+const Type NiMeshParticleSystem::TYPE("NiMeshParticleSystem", &NI_MESH_PARTICLE_SYSTEM_PARENT::TYPE );
 
 NiMeshParticleSystem::NiMeshParticleSystem() NI_MESH_PARTICLE_SYSTEM_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiMeshParticleSystem::GetRefs() const {
 const Type & NiMeshParticleSystem::GetType() const {
 	return TYPE;
 };
-
-const Type & NiMeshParticleSystem::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiMorphData.cpp b/src/obj/NiMorphData.cpp
index 55b79b421c7dbcc4e87cab1fedf579da4cd82774..d395af2efe170ae7364e7e6d3b9b57200b5949ce 100644
--- a/src/obj/NiMorphData.cpp
+++ b/src/obj/NiMorphData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiMorphData::TYPE("NiMorphData", &NI_MORPH_DATA_PARENT::TypeConst() );
+const Type NiMorphData::TYPE("NiMorphData", &NI_MORPH_DATA_PARENT::TYPE );
 
 NiMorphData::NiMorphData() NI_MORPH_DATA_CONSTRUCT {}
 
@@ -90,7 +90,3 @@ void NiMorphData::SetMorphVerts( int n, const vector<Vector3> & in ) {
 	//It's the right size, so go ahead and set it
 	morphs[n].vectors = in;
 }
-
-const Type & NiMorphData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiMultiTargetTransformController.cpp b/src/obj/NiMultiTargetTransformController.cpp
index bf4c08a8d5239f497a2f4b78b4a71274f75d83b8..e1e5d6b34e91420a761f6357440a0bbb90a2e8b4 100644
--- a/src/obj/NiMultiTargetTransformController.cpp
+++ b/src/obj/NiMultiTargetTransformController.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiMultiTargetTransformController::TYPE("NiMultiTargetTransformController", &NI_MULTI_TARGET_TRANSFORM_CONTROLLER_PARENT::TypeConst() );
+const Type NiMultiTargetTransformController::TYPE("NiMultiTargetTransformController", &NI_MULTI_TARGET_TRANSFORM_CONTROLLER_PARENT::TYPE );
 
 NiMultiTargetTransformController::NiMultiTargetTransformController() NI_MULTI_TARGET_TRANSFORM_CONTROLLER_CONSTRUCT {}
 
@@ -54,7 +54,3 @@ void NiMultiTargetTransformController::SetExtraTargets( const vector<NiNodeRef>&
       extraTargets.push_back( value[i] );
    extraTargets.erase(std::remove(extraTargets.begin(), extraTargets.end(), (NiNode*)NULL), extraTargets.end());
 }
-
-const Type & NiMultiTargetTransformController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiNode.cpp b/src/obj/NiNode.cpp
index da13cfae6cb37e8d8715e09a93dfb104a3dd7e7d..b35f136a821644ec8aac824849693de1af4bb9ce 100644
--- a/src/obj/NiNode.cpp
+++ b/src/obj/NiNode.cpp
@@ -10,7 +10,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiNode::TYPE("NiNode", &NI_NODE_PARENT::TypeConst() );
+const Type NiNode::TYPE("NiNode", &NI_NODE_PARENT::TYPE );
 
 NiNode::NiNode() NI_NODE_CONSTRUCT {
 	//Set flag to default of 8: not a skin influence
@@ -260,7 +260,7 @@ bool NiNode::IsSplitMeshProxy() const {
 	}
 
 	for ( unsigned i = 0; i < children.size(); ++i ) {
-		if ( children[i]->IsDerivedType( NiTriBasedGeom::TypeConst() ) == false ) {
+		if ( children[i]->IsDerivedType( NiTriBasedGeom::TYPE ) == false ) {
 			return false;
 		}
 		if ( children[i]->GetLocalTransform() != Matrix44::IDENTITY ) {
@@ -274,7 +274,3 @@ bool NiNode::IsSplitMeshProxy() const {
 	//Made it all the way through the loop without returning false
 	return true;
 }
-
-const Type & NiNode::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiObject.cpp b/src/obj/NiObject.cpp
index 45e3c59f74fcc1711b33d7792c7e3154fd86ea42..351a6b7c61358566513cc2aeff3b1f7a71c2bcdb 100644
--- a/src/obj/NiObject.cpp
+++ b/src/obj/NiObject.cpp
@@ -99,7 +99,3 @@ const Type & NiObject::GetType() const {
 unsigned int NiObject::GetNumRefs() {
 	return _ref_count;
 }
-
-const Type & NiObject::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiObjectNET.cpp b/src/obj/NiObjectNET.cpp
index c131ed203b4353a77d32e11021301bbf8d85f863..205a45a0a4b3005a079fa22b8656e104586e3c87 100644
--- a/src/obj/NiObjectNET.cpp
+++ b/src/obj/NiObjectNET.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiObjectNET::TYPE("NiObjectNET", &NI_OBJECT_N_E_T_PARENT::TypeConst() );
+const Type NiObjectNET::TYPE("NiObjectNET", &NI_OBJECT_N_E_T_PARENT::TYPE );
 
 NiObjectNET::NiObjectNET() NI_OBJECT_N_E_T_CONSTRUCT {}
 
@@ -187,7 +187,3 @@ list< Ref<NiTimeController> > NiObjectNET::GetControllers() const {
 const Type & NiObjectNET::GetType() const {
 	return TYPE;
 };
-
-const Type & NiObjectNET::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysAgeDeathModifier.cpp b/src/obj/NiPSysAgeDeathModifier.cpp
index 79986b39748d627b533d1c6ce9e30c08967361a9..2d1f92b0ec3ee8947dac362c82e25e1c7099cdbb 100644
--- a/src/obj/NiPSysAgeDeathModifier.cpp
+++ b/src/obj/NiPSysAgeDeathModifier.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysAgeDeathModifier::TYPE("NiPSysAgeDeathModifier", &NI_P_SYS_AGE_DEATH_MODIFIER_PARENT::TypeConst() );
+const Type NiPSysAgeDeathModifier::TYPE("NiPSysAgeDeathModifier", &NI_P_SYS_AGE_DEATH_MODIFIER_PARENT::TYPE );
 
 NiPSysAgeDeathModifier::NiPSysAgeDeathModifier() NI_P_SYS_AGE_DEATH_MODIFIER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysAgeDeathModifier::GetRefs() const {
 const Type & NiPSysAgeDeathModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysAgeDeathModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysBombModifier.cpp b/src/obj/NiPSysBombModifier.cpp
index 24ed96677bcf8c28110911e9b128bf14be30c5f6..2088462644021ca289ed774f369e6ef0e1768ec1 100644
--- a/src/obj/NiPSysBombModifier.cpp
+++ b/src/obj/NiPSysBombModifier.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysBombModifier::TYPE("NiPSysBombModifier", &NI_P_SYS_BOMB_MODIFIER_PARENT::TypeConst() );
+const Type NiPSysBombModifier::TYPE("NiPSysBombModifier", &NI_P_SYS_BOMB_MODIFIER_PARENT::TYPE );
 
 NiPSysBombModifier::NiPSysBombModifier() NI_P_SYS_BOMB_MODIFIER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysBombModifier::GetRefs() const {
 const Type & NiPSysBombModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysBombModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysBoundUpdateModifier.cpp b/src/obj/NiPSysBoundUpdateModifier.cpp
index 047009d18df0614f27417c3e4fe14097592cabc6..ab9ea44fb21eb04971ce2b087d701eff775c0b55 100644
--- a/src/obj/NiPSysBoundUpdateModifier.cpp
+++ b/src/obj/NiPSysBoundUpdateModifier.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysBoundUpdateModifier::TYPE("NiPSysBoundUpdateModifier", &NI_P_SYS_BOUND_UPDATE_MODIFIER_PARENT::TypeConst() );
+const Type NiPSysBoundUpdateModifier::TYPE("NiPSysBoundUpdateModifier", &NI_P_SYS_BOUND_UPDATE_MODIFIER_PARENT::TYPE );
 
 NiPSysBoundUpdateModifier::NiPSysBoundUpdateModifier() NI_P_SYS_BOUND_UPDATE_MODIFIER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysBoundUpdateModifier::GetRefs() const {
 const Type & NiPSysBoundUpdateModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysBoundUpdateModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysBoxEmitter.cpp b/src/obj/NiPSysBoxEmitter.cpp
index 54818a3f15d2ec29c464dc338e1383a44eaded96..4c45597c0cd00620db28a2cf7135f5db883ec5ff 100644
--- a/src/obj/NiPSysBoxEmitter.cpp
+++ b/src/obj/NiPSysBoxEmitter.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysBoxEmitter::TYPE("NiPSysBoxEmitter", &NI_P_SYS_BOX_EMITTER_PARENT::TypeConst() );
+const Type NiPSysBoxEmitter::TYPE("NiPSysBoxEmitter", &NI_P_SYS_BOX_EMITTER_PARENT::TYPE );
 
 NiPSysBoxEmitter::NiPSysBoxEmitter() NI_P_SYS_BOX_EMITTER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysBoxEmitter::GetRefs() const {
 const Type & NiPSysBoxEmitter::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysBoxEmitter::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysColliderManager.cpp b/src/obj/NiPSysColliderManager.cpp
index fc6d35037b398c9961d232aaca4d4df57f71b426..e5b585c8573414e90e4b59b3aece3563c05aa9fd 100644
--- a/src/obj/NiPSysColliderManager.cpp
+++ b/src/obj/NiPSysColliderManager.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysColliderManager::TYPE("NiPSysColliderManager", &NI_P_SYS_COLLIDER_MANAGER_PARENT::TypeConst() );
+const Type NiPSysColliderManager::TYPE("NiPSysColliderManager", &NI_P_SYS_COLLIDER_MANAGER_PARENT::TYPE );
 
 NiPSysColliderManager::NiPSysColliderManager() NI_P_SYS_COLLIDER_MANAGER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysColliderManager::GetRefs() const {
 const Type & NiPSysColliderManager::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysColliderManager::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysColorModifier.cpp b/src/obj/NiPSysColorModifier.cpp
index 4d9e2739475b278742749a5e4e63fcf4a33cb5f5..24ff666c75a2d074e582aadea63fb9269024da27 100644
--- a/src/obj/NiPSysColorModifier.cpp
+++ b/src/obj/NiPSysColorModifier.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysColorModifier::TYPE("NiPSysColorModifier", &NI_P_SYS_COLOR_MODIFIER_PARENT::TypeConst() );
+const Type NiPSysColorModifier::TYPE("NiPSysColorModifier", &NI_P_SYS_COLOR_MODIFIER_PARENT::TYPE );
 
 NiPSysColorModifier::NiPSysColorModifier() NI_P_SYS_COLOR_MODIFIER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysColorModifier::GetRefs() const {
 const Type & NiPSysColorModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysColorModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysCylinderEmitter.cpp b/src/obj/NiPSysCylinderEmitter.cpp
index 59629687eb02d8dfe8fd5d9157e9b26d2416c054..1e77b2071a17f78549fd886a73252942cfab8bb4 100644
--- a/src/obj/NiPSysCylinderEmitter.cpp
+++ b/src/obj/NiPSysCylinderEmitter.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysCylinderEmitter::TYPE("NiPSysCylinderEmitter", &NI_P_SYS_CYLINDER_EMITTER_PARENT::TypeConst() );
+const Type NiPSysCylinderEmitter::TYPE("NiPSysCylinderEmitter", &NI_P_SYS_CYLINDER_EMITTER_PARENT::TYPE );
 
 NiPSysCylinderEmitter::NiPSysCylinderEmitter() NI_P_SYS_CYLINDER_EMITTER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysCylinderEmitter::GetRefs() const {
 const Type & NiPSysCylinderEmitter::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysCylinderEmitter::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysData.cpp b/src/obj/NiPSysData.cpp
index c2726694fc5a39357f1f70a5a37ef8ae5e51fd16..5d3259685e0b36806400d450903a1b38e1c0ad22 100644
--- a/src/obj/NiPSysData.cpp
+++ b/src/obj/NiPSysData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysData::TYPE("NiPSysData", &NI_P_SYS_DATA_PARENT::TypeConst() );
+const Type NiPSysData::TYPE("NiPSysData", &NI_P_SYS_DATA_PARENT::TYPE );
 
 NiPSysData::NiPSysData() NI_P_SYS_DATA_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysData::GetRefs() const {
 const Type & NiPSysData::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysDragModifier.cpp b/src/obj/NiPSysDragModifier.cpp
index 93c160298534c859ca0c54121fad11c7187be7cc..c69fab7afba9f7b02e1c885d6e6c005b2816496d 100644
--- a/src/obj/NiPSysDragModifier.cpp
+++ b/src/obj/NiPSysDragModifier.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysDragModifier::TYPE("NiPSysDragModifier", &NI_P_SYS_DRAG_MODIFIER_PARENT::TypeConst() );
+const Type NiPSysDragModifier::TYPE("NiPSysDragModifier", &NI_P_SYS_DRAG_MODIFIER_PARENT::TYPE );
 
 NiPSysDragModifier::NiPSysDragModifier() NI_P_SYS_DRAG_MODIFIER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysDragModifier::GetRefs() const {
 const Type & NiPSysDragModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysDragModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysEmitter.cpp b/src/obj/NiPSysEmitter.cpp
index 96382879ee543baed413c0b17d1925b21b431d65..a7416fb483b0a8fedd3394fcf652911f1091f78d 100644
--- a/src/obj/NiPSysEmitter.cpp
+++ b/src/obj/NiPSysEmitter.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysEmitter::TYPE("NiPSysEmitter", &NI_P_SYS_EMITTER_PARENT::TypeConst() );
+const Type NiPSysEmitter::TYPE("NiPSysEmitter", &NI_P_SYS_EMITTER_PARENT::TYPE );
 
 NiPSysEmitter::NiPSysEmitter() NI_P_SYS_EMITTER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysEmitter::GetRefs() const {
 const Type & NiPSysEmitter::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysEmitter::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysEmitterCtlr.cpp b/src/obj/NiPSysEmitterCtlr.cpp
index 1267d9a21ae7d19d2fa5d78830cbe0741dbe3c2d..d33939b75b12c9caefb39300c40f63012852ab9d 100644
--- a/src/obj/NiPSysEmitterCtlr.cpp
+++ b/src/obj/NiPSysEmitterCtlr.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysEmitterCtlr::TYPE("NiPSysEmitterCtlr", &NI_P_SYS_EMITTER_CTLR_PARENT::TypeConst() );
+const Type NiPSysEmitterCtlr::TYPE("NiPSysEmitterCtlr", &NI_P_SYS_EMITTER_CTLR_PARENT::TYPE );
 
 NiPSysEmitterCtlr::NiPSysEmitterCtlr() NI_P_SYS_EMITTER_CTLR_CONSTRUCT {}
 
@@ -52,7 +52,3 @@ Ref<NiInterpolator > NiPSysEmitterCtlr::GetVisibilityInterpolator() const {
 void NiPSysEmitterCtlr::SetVisibilityInterpolator( NiInterpolator * value ) {
 	visibilityInterpolator = value;
 }
-
-const Type & NiPSysEmitterCtlr::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysEmitterCtlrData.cpp b/src/obj/NiPSysEmitterCtlrData.cpp
index 15204fbf580fffea97a2e1b1da4c61b69f314c04..cac4c441cb4df7ed8589f0feb171656cd7fe86d1 100644
--- a/src/obj/NiPSysEmitterCtlrData.cpp
+++ b/src/obj/NiPSysEmitterCtlrData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysEmitterCtlrData::TYPE("NiPSysEmitterCtlrData", &NI_P_SYS_EMITTER_CTLR_DATA_PARENT::TypeConst() );
+const Type NiPSysEmitterCtlrData::TYPE("NiPSysEmitterCtlrData", &NI_P_SYS_EMITTER_CTLR_DATA_PARENT::TYPE );
 
 NiPSysEmitterCtlrData::NiPSysEmitterCtlrData() NI_P_SYS_EMITTER_CTLR_DATA_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysEmitterCtlrData::GetRefs() const {
 const Type & NiPSysEmitterCtlrData::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysEmitterCtlrData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysEmitterDeclinationCtlr.cpp b/src/obj/NiPSysEmitterDeclinationCtlr.cpp
index d29d157735ffc6f681021981544d7f07a071cc50..a9ce70dd859a1de40c2f799422f892d83880ebfd 100644
--- a/src/obj/NiPSysEmitterDeclinationCtlr.cpp
+++ b/src/obj/NiPSysEmitterDeclinationCtlr.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysEmitterDeclinationCtlr::TYPE("NiPSysEmitterDeclinationCtlr", &NI_P_SYS_EMITTER_DECLINATION_CTLR_PARENT::TypeConst() );
+const Type NiPSysEmitterDeclinationCtlr::TYPE("NiPSysEmitterDeclinationCtlr", &NI_P_SYS_EMITTER_DECLINATION_CTLR_PARENT::TYPE );
 
 NiPSysEmitterDeclinationCtlr::NiPSysEmitterDeclinationCtlr() NI_P_SYS_EMITTER_DECLINATION_CTLR_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysEmitterDeclinationCtlr::GetRefs() const {
 const Type & NiPSysEmitterDeclinationCtlr::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysEmitterDeclinationCtlr::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp b/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp
index 7ce7972a601d28c7a223609f35853f3cecb5ea25..2da4240b57c5ba676b62aa67dd1ce5e60a997b8d 100644
--- a/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp
+++ b/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysEmitterDeclinationVarCtlr::TYPE("NiPSysEmitterDeclinationVarCtlr", &NI_P_SYS_EMITTER_DECLINATION_VAR_CTLR_PARENT::TypeConst() );
+const Type NiPSysEmitterDeclinationVarCtlr::TYPE("NiPSysEmitterDeclinationVarCtlr", &NI_P_SYS_EMITTER_DECLINATION_VAR_CTLR_PARENT::TYPE );
 
 NiPSysEmitterDeclinationVarCtlr::NiPSysEmitterDeclinationVarCtlr() NI_P_SYS_EMITTER_DECLINATION_VAR_CTLR_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysEmitterDeclinationVarCtlr::GetRefs() const {
 const Type & NiPSysEmitterDeclinationVarCtlr::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysEmitterDeclinationVarCtlr::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp b/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp
index 9a1017df7f9c59a78bb7089dc669e7ab343a8e5f..4422162ae49ca49bd38ec3b275cde2936c16d252 100644
--- a/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp
+++ b/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysEmitterInitialRadiusCtlr::TYPE("NiPSysEmitterInitialRadiusCtlr", &NI_P_SYS_EMITTER_INITIAL_RADIUS_CTLR_PARENT::TypeConst() );
+const Type NiPSysEmitterInitialRadiusCtlr::TYPE("NiPSysEmitterInitialRadiusCtlr", &NI_P_SYS_EMITTER_INITIAL_RADIUS_CTLR_PARENT::TYPE );
 
 NiPSysEmitterInitialRadiusCtlr::NiPSysEmitterInitialRadiusCtlr() NI_P_SYS_EMITTER_INITIAL_RADIUS_CTLR_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysEmitterInitialRadiusCtlr::GetRefs() const {
 const Type & NiPSysEmitterInitialRadiusCtlr::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysEmitterInitialRadiusCtlr::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysEmitterLifeSpanCtlr.cpp b/src/obj/NiPSysEmitterLifeSpanCtlr.cpp
index c6687debbebf8da6cd1e459999136430b3b8c70e..2a6196dc65df29ee834f3b14dfd392b9be2d4e1e 100644
--- a/src/obj/NiPSysEmitterLifeSpanCtlr.cpp
+++ b/src/obj/NiPSysEmitterLifeSpanCtlr.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysEmitterLifeSpanCtlr::TYPE("NiPSysEmitterLifeSpanCtlr", &NI_P_SYS_EMITTER_LIFE_SPAN_CTLR_PARENT::TypeConst() );
+const Type NiPSysEmitterLifeSpanCtlr::TYPE("NiPSysEmitterLifeSpanCtlr", &NI_P_SYS_EMITTER_LIFE_SPAN_CTLR_PARENT::TYPE );
 
 NiPSysEmitterLifeSpanCtlr::NiPSysEmitterLifeSpanCtlr() NI_P_SYS_EMITTER_LIFE_SPAN_CTLR_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysEmitterLifeSpanCtlr::GetRefs() const {
 const Type & NiPSysEmitterLifeSpanCtlr::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysEmitterLifeSpanCtlr::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysEmitterSpeedCtlr.cpp b/src/obj/NiPSysEmitterSpeedCtlr.cpp
index bdf1398749f9543e33c1f981eaaceca0d11969bc..7b659990d189f76f85bbc06d1742660d2dad381f 100644
--- a/src/obj/NiPSysEmitterSpeedCtlr.cpp
+++ b/src/obj/NiPSysEmitterSpeedCtlr.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysEmitterSpeedCtlr::TYPE("NiPSysEmitterSpeedCtlr", &NI_P_SYS_EMITTER_SPEED_CTLR_PARENT::TypeConst() );
+const Type NiPSysEmitterSpeedCtlr::TYPE("NiPSysEmitterSpeedCtlr", &NI_P_SYS_EMITTER_SPEED_CTLR_PARENT::TYPE );
 
 NiPSysEmitterSpeedCtlr::NiPSysEmitterSpeedCtlr() NI_P_SYS_EMITTER_SPEED_CTLR_CONSTRUCT {}
 
@@ -36,7 +36,3 @@ list<NiObjectRef> NiPSysEmitterSpeedCtlr::GetRefs() const {
 const Type & NiPSysEmitterSpeedCtlr::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysEmitterSpeedCtlr::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysGravityModifier.cpp b/src/obj/NiPSysGravityModifier.cpp
index 01eb1029cbd21f96691d4528e2ce554fd86a560a..449e2847a0727b3938f1bb7f40971440d8b8134b 100644
--- a/src/obj/NiPSysGravityModifier.cpp
+++ b/src/obj/NiPSysGravityModifier.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysGravityModifier::TYPE("NiPSysGravityModifier", &NI_P_SYS_GRAVITY_MODIFIER_PARENT::TypeConst() );
+const Type NiPSysGravityModifier::TYPE("NiPSysGravityModifier", &NI_P_SYS_GRAVITY_MODIFIER_PARENT::TYPE );
 
 NiPSysGravityModifier::NiPSysGravityModifier() NI_P_SYS_GRAVITY_MODIFIER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysGravityModifier::GetRefs() const {
 const Type & NiPSysGravityModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysGravityModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysGravityStrengthCtlr.cpp b/src/obj/NiPSysGravityStrengthCtlr.cpp
index c9cf6253da8bf9a0d2cf9d1aa09f0b4168984871..2787ae4c755471da6a6603478d06a1128e9951f1 100644
--- a/src/obj/NiPSysGravityStrengthCtlr.cpp
+++ b/src/obj/NiPSysGravityStrengthCtlr.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysGravityStrengthCtlr::TYPE("NiPSysGravityStrengthCtlr", &NI_P_SYS_GRAVITY_STRENGTH_CTLR_PARENT::TypeConst() );
+const Type NiPSysGravityStrengthCtlr::TYPE("NiPSysGravityStrengthCtlr", &NI_P_SYS_GRAVITY_STRENGTH_CTLR_PARENT::TYPE );
 
 NiPSysGravityStrengthCtlr::NiPSysGravityStrengthCtlr() NI_P_SYS_GRAVITY_STRENGTH_CTLR_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysGravityStrengthCtlr::GetRefs() const {
 const Type & NiPSysGravityStrengthCtlr::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysGravityStrengthCtlr::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysGrowFadeModifier.cpp b/src/obj/NiPSysGrowFadeModifier.cpp
index 20de9aa6837be9d59e9e4d686560ae601b56ba81..f2533a3e79f62c50302e07129cdbf91aa0e0514a 100644
--- a/src/obj/NiPSysGrowFadeModifier.cpp
+++ b/src/obj/NiPSysGrowFadeModifier.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysGrowFadeModifier::TYPE("NiPSysGrowFadeModifier", &NI_P_SYS_GROW_FADE_MODIFIER_PARENT::TypeConst() );
+const Type NiPSysGrowFadeModifier::TYPE("NiPSysGrowFadeModifier", &NI_P_SYS_GROW_FADE_MODIFIER_PARENT::TYPE );
 
 NiPSysGrowFadeModifier::NiPSysGrowFadeModifier() NI_P_SYS_GROW_FADE_MODIFIER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysGrowFadeModifier::GetRefs() const {
 const Type & NiPSysGrowFadeModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysGrowFadeModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysMeshEmitter.cpp b/src/obj/NiPSysMeshEmitter.cpp
index ea1c4e2f23a5986d708ae2caa1dd53229f64ffc1..1f9cc452016bf978b022edbf34ce33086008a07c 100644
--- a/src/obj/NiPSysMeshEmitter.cpp
+++ b/src/obj/NiPSysMeshEmitter.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysMeshEmitter::TYPE("NiPSysMeshEmitter", &NI_P_SYS_MESH_EMITTER_PARENT::TypeConst() );
+const Type NiPSysMeshEmitter::TYPE("NiPSysMeshEmitter", &NI_P_SYS_MESH_EMITTER_PARENT::TYPE );
 
 NiPSysMeshEmitter::NiPSysMeshEmitter() NI_P_SYS_MESH_EMITTER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysMeshEmitter::GetRefs() const {
 const Type & NiPSysMeshEmitter::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysMeshEmitter::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysMeshUpdateModifier.cpp b/src/obj/NiPSysMeshUpdateModifier.cpp
index ae629ee8fc24765ac4e454c60de24c2d4c00eea0..2bca31c271bcbd34b1380b93e66f568b956b5413 100644
--- a/src/obj/NiPSysMeshUpdateModifier.cpp
+++ b/src/obj/NiPSysMeshUpdateModifier.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysMeshUpdateModifier::TYPE("NiPSysMeshUpdateModifier", &NI_P_SYS_MESH_UPDATE_MODIFIER_PARENT::TypeConst() );
+const Type NiPSysMeshUpdateModifier::TYPE("NiPSysMeshUpdateModifier", &NI_P_SYS_MESH_UPDATE_MODIFIER_PARENT::TYPE );
 
 NiPSysMeshUpdateModifier::NiPSysMeshUpdateModifier() NI_P_SYS_MESH_UPDATE_MODIFIER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysMeshUpdateModifier::GetRefs() const {
 const Type & NiPSysMeshUpdateModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysMeshUpdateModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysModifier.cpp b/src/obj/NiPSysModifier.cpp
index 9b769d1f9c30738e72093e1e483f47a5d185f55c..572b6a3e7610ec248f11cac55dc5d6e27662941e 100644
--- a/src/obj/NiPSysModifier.cpp
+++ b/src/obj/NiPSysModifier.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysModifier::TYPE("NiPSysModifier", &NI_P_SYS_MODIFIER_PARENT::TypeConst() );
+const Type NiPSysModifier::TYPE("NiPSysModifier", &NI_P_SYS_MODIFIER_PARENT::TYPE );
 
 NiPSysModifier::NiPSysModifier() NI_P_SYS_MODIFIER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysModifier::GetRefs() const {
 const Type & NiPSysModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysModifierActiveCtlr.cpp b/src/obj/NiPSysModifierActiveCtlr.cpp
index cb3aa4b8e06251cb76b2b0c008d9490fbbfe23e1..db3d62ffb2d171f5b2beac45c2960dc9502c8192 100644
--- a/src/obj/NiPSysModifierActiveCtlr.cpp
+++ b/src/obj/NiPSysModifierActiveCtlr.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysModifierActiveCtlr::TYPE("NiPSysModifierActiveCtlr", &NI_P_SYS_MODIFIER_ACTIVE_CTLR_PARENT::TypeConst() );
+const Type NiPSysModifierActiveCtlr::TYPE("NiPSysModifierActiveCtlr", &NI_P_SYS_MODIFIER_ACTIVE_CTLR_PARENT::TYPE );
 
 NiPSysModifierActiveCtlr::NiPSysModifierActiveCtlr() NI_P_SYS_MODIFIER_ACTIVE_CTLR_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysModifierActiveCtlr::GetRefs() const {
 const Type & NiPSysModifierActiveCtlr::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysModifierActiveCtlr::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysPlanarCollider.cpp b/src/obj/NiPSysPlanarCollider.cpp
index 0eeadf19bef58e375ff2fa54f2e14473ee53d010..907a121cc10f28849b4ddc72d9879e0b988aaf12 100644
--- a/src/obj/NiPSysPlanarCollider.cpp
+++ b/src/obj/NiPSysPlanarCollider.cpp
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysPlanarCollider::TYPE("NiPSysPlanarCollider", &NI_P_SYS_PLANAR_COLLIDER_PARENT::TypeConst() );
+const Type NiPSysPlanarCollider::TYPE("NiPSysPlanarCollider", &NI_P_SYS_PLANAR_COLLIDER_PARENT::TYPE );
 
 NiPSysPlanarCollider::NiPSysPlanarCollider() NI_P_SYS_PLANAR_COLLIDER_CONSTRUCT {}
 
@@ -37,7 +37,3 @@ list<NiObjectRef> NiPSysPlanarCollider::GetRefs() const {
 const Type & NiPSysPlanarCollider::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysPlanarCollider::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysPositionModifier.cpp b/src/obj/NiPSysPositionModifier.cpp
index f1c74582b8dd95bd4b7fc8108a8f61e4629d67fe..c0c46187be3b94b7efb405416b7e3d1088449304 100644
--- a/src/obj/NiPSysPositionModifier.cpp
+++ b/src/obj/NiPSysPositionModifier.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysPositionModifier::TYPE("NiPSysPositionModifier", &NI_P_SYS_POSITION_MODIFIER_PARENT::TypeConst() );
+const Type NiPSysPositionModifier::TYPE("NiPSysPositionModifier", &NI_P_SYS_POSITION_MODIFIER_PARENT::TYPE );
 
 NiPSysPositionModifier::NiPSysPositionModifier() NI_P_SYS_POSITION_MODIFIER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysPositionModifier::GetRefs() const {
 const Type & NiPSysPositionModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysPositionModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysResetOnLoopCtlr.cpp b/src/obj/NiPSysResetOnLoopCtlr.cpp
index 47eb901dc3fe64be43919deffd3b0870d25302bd..53a6164515b94c38b6b04dc6df4aaf2503159a62 100644
--- a/src/obj/NiPSysResetOnLoopCtlr.cpp
+++ b/src/obj/NiPSysResetOnLoopCtlr.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysResetOnLoopCtlr::TYPE("NiPSysResetOnLoopCtlr", &NI_P_SYS_RESET_ON_LOOP_CTLR_PARENT::TypeConst() );
+const Type NiPSysResetOnLoopCtlr::TYPE("NiPSysResetOnLoopCtlr", &NI_P_SYS_RESET_ON_LOOP_CTLR_PARENT::TYPE );
 
 NiPSysResetOnLoopCtlr::NiPSysResetOnLoopCtlr() NI_P_SYS_RESET_ON_LOOP_CTLR_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysResetOnLoopCtlr::GetRefs() const {
 const Type & NiPSysResetOnLoopCtlr::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysResetOnLoopCtlr::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysRotationModifier.cpp b/src/obj/NiPSysRotationModifier.cpp
index 2d96e2a2ce723e9219fc5ffb21b96ab65e707d33..39c2c447e28b94c832669d2491d16389c7c0adb8 100644
--- a/src/obj/NiPSysRotationModifier.cpp
+++ b/src/obj/NiPSysRotationModifier.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysRotationModifier::TYPE("NiPSysRotationModifier", &NI_P_SYS_ROTATION_MODIFIER_PARENT::TypeConst() );
+const Type NiPSysRotationModifier::TYPE("NiPSysRotationModifier", &NI_P_SYS_ROTATION_MODIFIER_PARENT::TYPE );
 
 NiPSysRotationModifier::NiPSysRotationModifier() NI_P_SYS_ROTATION_MODIFIER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysRotationModifier::GetRefs() const {
 const Type & NiPSysRotationModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysRotationModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysSpawnModifier.cpp b/src/obj/NiPSysSpawnModifier.cpp
index 3520f2f243d242eb3d83717b84b0bfadea4e8957..0750838c53312ec0330de761e3450dd90a3dcfaa 100644
--- a/src/obj/NiPSysSpawnModifier.cpp
+++ b/src/obj/NiPSysSpawnModifier.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysSpawnModifier::TYPE("NiPSysSpawnModifier", &NI_P_SYS_SPAWN_MODIFIER_PARENT::TypeConst() );
+const Type NiPSysSpawnModifier::TYPE("NiPSysSpawnModifier", &NI_P_SYS_SPAWN_MODIFIER_PARENT::TYPE );
 
 NiPSysSpawnModifier::NiPSysSpawnModifier() NI_P_SYS_SPAWN_MODIFIER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysSpawnModifier::GetRefs() const {
 const Type & NiPSysSpawnModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysSpawnModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysSphereEmitter.cpp b/src/obj/NiPSysSphereEmitter.cpp
index 38d7a07076554ad2cc294197c643a550c82aaee2..cc554fa7fb7133aad59028f63c17b9ce2b7e2025 100644
--- a/src/obj/NiPSysSphereEmitter.cpp
+++ b/src/obj/NiPSysSphereEmitter.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysSphereEmitter::TYPE("NiPSysSphereEmitter", &NI_P_SYS_SPHERE_EMITTER_PARENT::TypeConst() );
+const Type NiPSysSphereEmitter::TYPE("NiPSysSphereEmitter", &NI_P_SYS_SPHERE_EMITTER_PARENT::TYPE );
 
 NiPSysSphereEmitter::NiPSysSphereEmitter() NI_P_SYS_SPHERE_EMITTER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysSphereEmitter::GetRefs() const {
 const Type & NiPSysSphereEmitter::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysSphereEmitter::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysUpdateCtlr.cpp b/src/obj/NiPSysUpdateCtlr.cpp
index 7fedf06a5288b1de522b3b7e9b3b36fef78f368a..24f8c5f810bb58e57b9ab4383ee2f7ae9f31331c 100644
--- a/src/obj/NiPSysUpdateCtlr.cpp
+++ b/src/obj/NiPSysUpdateCtlr.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysUpdateCtlr::TYPE("NiPSysUpdateCtlr", &NI_P_SYS_UPDATE_CTLR_PARENT::TypeConst() );
+const Type NiPSysUpdateCtlr::TYPE("NiPSysUpdateCtlr", &NI_P_SYS_UPDATE_CTLR_PARENT::TYPE );
 
 NiPSysUpdateCtlr::NiPSysUpdateCtlr() NI_P_SYS_UPDATE_CTLR_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysUpdateCtlr::GetRefs() const {
 const Type & NiPSysUpdateCtlr::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysUpdateCtlr::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPSysVolumeEmitter.cpp b/src/obj/NiPSysVolumeEmitter.cpp
index cfaa05a832e7b8b0ce4624c919a040b97f95ad7a..f62d2b968efd898c07da0c49f980d1f7f3ecfb36 100644
--- a/src/obj/NiPSysVolumeEmitter.cpp
+++ b/src/obj/NiPSysVolumeEmitter.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPSysVolumeEmitter::TYPE("NiPSysVolumeEmitter", &NI_P_SYS_VOLUME_EMITTER_PARENT::TypeConst() );
+const Type NiPSysVolumeEmitter::TYPE("NiPSysVolumeEmitter", &NI_P_SYS_VOLUME_EMITTER_PARENT::TYPE );
 
 NiPSysVolumeEmitter::NiPSysVolumeEmitter() NI_P_SYS_VOLUME_EMITTER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysVolumeEmitter::GetRefs() const {
 const Type & NiPSysVolumeEmitter::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPSysVolumeEmitter::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPalette.cpp b/src/obj/NiPalette.cpp
index 5cc31e4a862850e2fdaffd4420e30beb1295f846..2445fcc6db6b0118eb18bf47697f57ae76f44387 100644
--- a/src/obj/NiPalette.cpp
+++ b/src/obj/NiPalette.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPalette::TYPE("NiPalette", &NI_PALETTE_PARENT::TypeConst() );
+const Type NiPalette::TYPE("NiPalette", &NI_PALETTE_PARENT::TYPE );
 
 NiPalette::NiPalette() NI_PALETTE_CONSTRUCT {}
 
@@ -61,7 +61,3 @@ void NiPalette::SetPalette( const vector<Color4> & new_pal ) {
 		palette[i][3] = int( new_pal[i].a * 255.0f );
 	}
 }
-
-const Type & NiPalette::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiParticleBomb.cpp b/src/obj/NiParticleBomb.cpp
index aea20b394a36e8e701dd6ad38422b7fe748587c0..ebf148acac6975e185d56d707e24d17fb0133c10 100644
--- a/src/obj/NiParticleBomb.cpp
+++ b/src/obj/NiParticleBomb.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiParticleBomb::TYPE("NiParticleBomb", &NI_PARTICLE_BOMB_PARENT::TypeConst() );
+const Type NiParticleBomb::TYPE("NiParticleBomb", &NI_PARTICLE_BOMB_PARENT::TYPE );
 
 NiParticleBomb::NiParticleBomb() NI_PARTICLE_BOMB_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiParticleBomb::GetRefs() const {
 const Type & NiParticleBomb::GetType() const {
 	return TYPE;
 };
-
-const Type & NiParticleBomb::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiParticleColorModifier.cpp b/src/obj/NiParticleColorModifier.cpp
index 2d50f417b872a53c2bae14b7fe2067217cfc5863..75778265b15d24f4fd88073ad4a82eed871438b7 100644
--- a/src/obj/NiParticleColorModifier.cpp
+++ b/src/obj/NiParticleColorModifier.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiParticleColorModifier::TYPE("NiParticleColorModifier", &NI_PARTICLE_COLOR_MODIFIER_PARENT::TypeConst() );
+const Type NiParticleColorModifier::TYPE("NiParticleColorModifier", &NI_PARTICLE_COLOR_MODIFIER_PARENT::TYPE );
 
 NiParticleColorModifier::NiParticleColorModifier() NI_PARTICLE_COLOR_MODIFIER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiParticleColorModifier::GetRefs() const {
 const Type & NiParticleColorModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & NiParticleColorModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiParticleGrowFade.cpp b/src/obj/NiParticleGrowFade.cpp
index 8ac1f794f2bfce46c168e3b93c4f638a7563c612..4f5425fa13bd707cd30a5b62a84789e9dd13a17a 100644
--- a/src/obj/NiParticleGrowFade.cpp
+++ b/src/obj/NiParticleGrowFade.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiParticleGrowFade::TYPE("NiParticleGrowFade", &NI_PARTICLE_GROW_FADE_PARENT::TypeConst() );
+const Type NiParticleGrowFade::TYPE("NiParticleGrowFade", &NI_PARTICLE_GROW_FADE_PARENT::TYPE );
 
 NiParticleGrowFade::NiParticleGrowFade() NI_PARTICLE_GROW_FADE_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiParticleGrowFade::GetRefs() const {
 const Type & NiParticleGrowFade::GetType() const {
 	return TYPE;
 };
-
-const Type & NiParticleGrowFade::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiParticleMeshModifier.cpp b/src/obj/NiParticleMeshModifier.cpp
index 24812ea79d19ebbc489e945dafb74e47832134d1..bcc2a276b56ec248f11bdfea7977950df6e7bf74 100644
--- a/src/obj/NiParticleMeshModifier.cpp
+++ b/src/obj/NiParticleMeshModifier.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiParticleMeshModifier::TYPE("NiParticleMeshModifier", &NI_PARTICLE_MESH_MODIFIER_PARENT::TypeConst() );
+const Type NiParticleMeshModifier::TYPE("NiParticleMeshModifier", &NI_PARTICLE_MESH_MODIFIER_PARENT::TYPE );
 
 NiParticleMeshModifier::NiParticleMeshModifier() NI_PARTICLE_MESH_MODIFIER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiParticleMeshModifier::GetRefs() const {
 const Type & NiParticleMeshModifier::GetType() const {
 	return TYPE;
 };
-
-const Type & NiParticleMeshModifier::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiParticleMeshes.cpp b/src/obj/NiParticleMeshes.cpp
index dc78081a7b5a6abae041ee588dc1e084593e48aa..1b7573b56677e92e4161692562bb3ac9c7b8c764 100644
--- a/src/obj/NiParticleMeshes.cpp
+++ b/src/obj/NiParticleMeshes.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiParticleMeshes::TYPE("NiParticleMeshes", &NI_PARTICLE_MESHES_PARENT::TypeConst() );
+const Type NiParticleMeshes::TYPE("NiParticleMeshes", &NI_PARTICLE_MESHES_PARENT::TYPE );
 
 NiParticleMeshes::NiParticleMeshes() NI_PARTICLE_MESHES_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiParticleMeshes::GetRefs() const {
 const Type & NiParticleMeshes::GetType() const {
 	return TYPE;
 };
-
-const Type & NiParticleMeshes::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiParticleMeshesData.cpp b/src/obj/NiParticleMeshesData.cpp
index 2bcb9ab5ebd4dab9357d04458ebc2a0aa9d3c104..0d916e389b007ccf04b7071444767dbe999e375e 100644
--- a/src/obj/NiParticleMeshesData.cpp
+++ b/src/obj/NiParticleMeshesData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiParticleMeshesData::TYPE("NiParticleMeshesData", &NI_PARTICLE_MESHES_DATA_PARENT::TypeConst() );
+const Type NiParticleMeshesData::TYPE("NiParticleMeshesData", &NI_PARTICLE_MESHES_DATA_PARENT::TYPE );
 
 NiParticleMeshesData::NiParticleMeshesData() NI_PARTICLE_MESHES_DATA_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiParticleMeshesData::GetRefs() const {
 const Type & NiParticleMeshesData::GetType() const {
 	return TYPE;
 };
-
-const Type & NiParticleMeshesData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiParticleRotation.cpp b/src/obj/NiParticleRotation.cpp
index a55791a559248f33b866a224a863da8f13d042e3..bc5a1f84e9c448c1a1841ba27f6d5abf6057e6f7 100644
--- a/src/obj/NiParticleRotation.cpp
+++ b/src/obj/NiParticleRotation.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiParticleRotation::TYPE("NiParticleRotation", &NI_PARTICLE_ROTATION_PARENT::TypeConst() );
+const Type NiParticleRotation::TYPE("NiParticleRotation", &NI_PARTICLE_ROTATION_PARENT::TYPE );
 
 NiParticleRotation::NiParticleRotation() NI_PARTICLE_ROTATION_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiParticleRotation::GetRefs() const {
 const Type & NiParticleRotation::GetType() const {
 	return TYPE;
 };
-
-const Type & NiParticleRotation::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiParticleSystem.cpp b/src/obj/NiParticleSystem.cpp
index 2866766a2fec998cbcda7c554899969c1bedf93e..c7435bbac66f183c9dbdfa29f167fb7be2178c25 100644
--- a/src/obj/NiParticleSystem.cpp
+++ b/src/obj/NiParticleSystem.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiParticleSystem::TYPE("NiParticleSystem", &NI_PARTICLE_SYSTEM_PARENT::TypeConst() );
+const Type NiParticleSystem::TYPE("NiParticleSystem", &NI_PARTICLE_SYSTEM_PARENT::TYPE );
 
 NiParticleSystem::NiParticleSystem() NI_PARTICLE_SYSTEM_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiParticleSystem::GetRefs() const {
 const Type & NiParticleSystem::GetType() const {
 	return TYPE;
 };
-
-const Type & NiParticleSystem::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiParticleSystemController.cpp b/src/obj/NiParticleSystemController.cpp
index b7ab5a10cb5a355cd51df7434b90b5be0520e5b7..6c9ef36dd7bb24f242b54f80df6a58aff0d0f907 100644
--- a/src/obj/NiParticleSystemController.cpp
+++ b/src/obj/NiParticleSystemController.cpp
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiParticleSystemController::TYPE("NiParticleSystemController", &NI_PARTICLE_SYSTEM_CONTROLLER_PARENT::TypeConst() );
+const Type NiParticleSystemController::TYPE("NiParticleSystemController", &NI_PARTICLE_SYSTEM_CONTROLLER_PARENT::TYPE );
 
 NiParticleSystemController::NiParticleSystemController() NI_PARTICLE_SYSTEM_CONTROLLER_CONSTRUCT {}
 
@@ -37,7 +37,3 @@ list<NiObjectRef> NiParticleSystemController::GetRefs() const {
 const Type & NiParticleSystemController::GetType() const {
 	return TYPE;
 };
-
-const Type & NiParticleSystemController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiParticles.cpp b/src/obj/NiParticles.cpp
index f24464e9421b8b187ab0647427489fd64de2c871..47ed1bc9ff494a076d0ba41af0a297530e5250f9 100644
--- a/src/obj/NiParticles.cpp
+++ b/src/obj/NiParticles.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiParticles::TYPE("NiParticles", &NI_PARTICLES_PARENT::TypeConst() );
+const Type NiParticles::TYPE("NiParticles", &NI_PARTICLES_PARENT::TYPE );
 
 NiParticles::NiParticles() NI_PARTICLES_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiParticles::GetRefs() const {
 const Type & NiParticles::GetType() const {
 	return TYPE;
 };
-
-const Type & NiParticles::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiParticlesData.cpp b/src/obj/NiParticlesData.cpp
index f9e315fb13e166344cf2e6bc5d2f57187c3efe84..32e2d4a4683339fee82a675642cc26b3563351e8 100644
--- a/src/obj/NiParticlesData.cpp
+++ b/src/obj/NiParticlesData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiParticlesData::TYPE("NiParticlesData", &NI_PARTICLES_DATA_PARENT::TypeConst() );
+const Type NiParticlesData::TYPE("NiParticlesData", &NI_PARTICLES_DATA_PARENT::TYPE );
 
 NiParticlesData::NiParticlesData() NI_PARTICLES_DATA_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiParticlesData::GetRefs() const {
 const Type & NiParticlesData::GetType() const {
 	return TYPE;
 };
-
-const Type & NiParticlesData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPathController.cpp b/src/obj/NiPathController.cpp
index ad24c91983dc5b6ab8e10391c5a70a495c5d5412..09c8b748174dfaf9d8f47e635561ecc35bb89bb3 100644
--- a/src/obj/NiPathController.cpp
+++ b/src/obj/NiPathController.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPathController::TYPE("NiPathController", &NI_PATH_CONTROLLER_PARENT::TypeConst() );
+const Type NiPathController::TYPE("NiPathController", &NI_PATH_CONTROLLER_PARENT::TYPE );
 
 NiPathController::NiPathController() NI_PATH_CONTROLLER_CONSTRUCT {}
 
@@ -52,7 +52,3 @@ Ref<NiPosData> NiPathController::GetPosData() const {
 void NiPathController::SetPosData( NiPosData * n ) {
 	posData = n;
 }
-
-const Type & NiPathController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPathInterpolator.cpp b/src/obj/NiPathInterpolator.cpp
index b92c8aca2c2dcd061e3a5c72a8ef0de128ac10b8..30d51b4d06d75979eb749cd59d47953757cc9f6b 100644
--- a/src/obj/NiPathInterpolator.cpp
+++ b/src/obj/NiPathInterpolator.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPathInterpolator::TYPE("NiPathInterpolator", &NI_PATH_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiPathInterpolator::TYPE("NiPathInterpolator", &NI_PATH_INTERPOLATOR_PARENT::TYPE );
 
 NiPathInterpolator::NiPathInterpolator() NI_PATH_INTERPOLATOR_CONSTRUCT {}
 
@@ -52,7 +52,3 @@ Ref<NiFloatData > NiPathInterpolator::GetFloatData() const {
 void NiPathInterpolator::SetFloatData( NiFloatData * value ) {
 	floatData = value;
 }
-
-const Type & NiPathInterpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPixelData.cpp b/src/obj/NiPixelData.cpp
index 7aadf9bd563fe8bb267235c4a7bad17df4b51f5b..c5469bfebc6be7c20ee7b76e0a05985b02af936d 100644
--- a/src/obj/NiPixelData.cpp
+++ b/src/obj/NiPixelData.cpp
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPixelData::TYPE("NiPixelData", &NI_PIXEL_DATA_PARENT::TypeConst() );
+const Type NiPixelData::TYPE("NiPixelData", &NI_PIXEL_DATA_PARENT::TYPE );
 
 NiPixelData::NiPixelData() NI_PIXEL_DATA_CONSTRUCT {}
 
@@ -345,7 +345,3 @@ void NiPixelData::SetColors( const vector<Color4> & new_pixels, bool generate_mi
 		}
 	}
 }
-
-const Type & NiPixelData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPlanarCollider.cpp b/src/obj/NiPlanarCollider.cpp
index 71a96f61fe02b529dbab21d4132f9103c9afe23c..7023ec8c347f276827cc21c69683571544a3e924 100644
--- a/src/obj/NiPlanarCollider.cpp
+++ b/src/obj/NiPlanarCollider.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPlanarCollider::TYPE("NiPlanarCollider", &NI_PLANAR_COLLIDER_PARENT::TypeConst() );
+const Type NiPlanarCollider::TYPE("NiPlanarCollider", &NI_PLANAR_COLLIDER_PARENT::TYPE );
 
 NiPlanarCollider::NiPlanarCollider() NI_PLANAR_COLLIDER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiPlanarCollider::GetRefs() const {
 const Type & NiPlanarCollider::GetType() const {
 	return TYPE;
 };
-
-const Type & NiPlanarCollider::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPoint3Interpolator.cpp b/src/obj/NiPoint3Interpolator.cpp
index 7d84fde3e95449b9f52cc91afe576994fb36f195..76fecce4c69050c8ef010adc000e998deae372a5 100644
--- a/src/obj/NiPoint3Interpolator.cpp
+++ b/src/obj/NiPoint3Interpolator.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPoint3Interpolator::TYPE("NiPoint3Interpolator", &NI_POINT3_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiPoint3Interpolator::TYPE("NiPoint3Interpolator", &NI_POINT3_INTERPOLATOR_PARENT::TYPE );
 
 NiPoint3Interpolator::NiPoint3Interpolator() NI_POINT3_INTERPOLATOR_CONSTRUCT {}
 
@@ -51,7 +51,3 @@ Ref<NiPosData > NiPoint3Interpolator::GetData() const {
 void NiPoint3Interpolator::SetData( NiPosData * value ) {
 	data = value;
 }
-
-const Type & NiPoint3Interpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPointLight.cpp b/src/obj/NiPointLight.cpp
index fb711e77918fda105b8bd872c8e4445d24b10975..9c7249411067f8f209eca7de91cdfc05da50e521 100644
--- a/src/obj/NiPointLight.cpp
+++ b/src/obj/NiPointLight.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPointLight::TYPE("NiPointLight", &NI_POINT_LIGHT_PARENT::TypeConst() );
+const Type NiPointLight::TYPE("NiPointLight", &NI_POINT_LIGHT_PARENT::TYPE );
 
 NiPointLight::NiPointLight() NI_POINT_LIGHT_CONSTRUCT {}
 
@@ -58,7 +58,3 @@ float NiPointLight::GetQuadraticAttenuation() const {
 void NiPointLight::SetQuadraticAttenuation( float value ) {
 	quadraticAttenuation = value;
 }
-
-const Type & NiPointLight::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiPosData.cpp b/src/obj/NiPosData.cpp
index 33e69ab302ef3616d42670a3bd4866ea57b2c1fd..7cc31e04bb27f405574c39341a0eb3998507361b 100644
--- a/src/obj/NiPosData.cpp
+++ b/src/obj/NiPosData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiPosData::TYPE("NiPosData", &NI_POS_DATA_PARENT::TypeConst() );
+const Type NiPosData::TYPE("NiPosData", &NI_POS_DATA_PARENT::TYPE );
 
 NiPosData::NiPosData() NI_POS_DATA_CONSTRUCT {}
 
@@ -51,7 +51,3 @@ vector< Key<Vector3> > NiPosData::GetKeys() const {
 void NiPosData::SetKeys( vector< Key<Vector3> > const & keys ) {
 	data.keys = keys;
 }
-
-const Type & NiPosData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiProperty.cpp b/src/obj/NiProperty.cpp
index e70d314db0f1c079c3aa0bfd0f4694cfe9795bc8..d7c238063803b9bda3cf4bf960ee711534b8906f 100644
--- a/src/obj/NiProperty.cpp
+++ b/src/obj/NiProperty.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiProperty::TYPE("NiProperty", &NI_PROPERTY_PARENT::TypeConst() );
+const Type NiProperty::TYPE("NiProperty", &NI_PROPERTY_PARENT::TYPE );
 
 NiProperty::NiProperty() NI_PROPERTY_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiProperty::GetRefs() const {
 const Type & NiProperty::GetType() const {
 	return TYPE;
 };
-
-const Type & NiProperty::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiRangeLODData.cpp b/src/obj/NiRangeLODData.cpp
index f2e6016c167a37218129876cccfdc48111135ae5..d9906a49c287c24438bb5282465a736568c6beff 100644
--- a/src/obj/NiRangeLODData.cpp
+++ b/src/obj/NiRangeLODData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiRangeLODData::TYPE("NiRangeLODData", &NI_RANGE_L_O_D_DATA_PARENT::TypeConst() );
+const Type NiRangeLODData::TYPE("NiRangeLODData", &NI_RANGE_L_O_D_DATA_PARENT::TYPE );
 
 NiRangeLODData::NiRangeLODData() NI_RANGE_L_O_D_DATA_CONSTRUCT {}
 
@@ -51,7 +51,3 @@ vector<LODRange > NiRangeLODData::GetLODLevels() const {
 void NiRangeLODData::SetLODLevels( const vector<LODRange >& value ) {
 	lodLevels = value;
 }
-
-const Type & NiRangeLODData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiRotatingParticles.cpp b/src/obj/NiRotatingParticles.cpp
index 424d46e0b21ddd78b7bfe11f13f65e77f415fcbe..86bfc3474c7e24db0de9fb7d7b93eb99af4d5628 100644
--- a/src/obj/NiRotatingParticles.cpp
+++ b/src/obj/NiRotatingParticles.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiRotatingParticles::TYPE("NiRotatingParticles", &NI_ROTATING_PARTICLES_PARENT::TypeConst() );
+const Type NiRotatingParticles::TYPE("NiRotatingParticles", &NI_ROTATING_PARTICLES_PARENT::TYPE );
 
 NiRotatingParticles::NiRotatingParticles() NI_ROTATING_PARTICLES_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiRotatingParticles::GetRefs() const {
 const Type & NiRotatingParticles::GetType() const {
 	return TYPE;
 };
-
-const Type & NiRotatingParticles::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiRotatingParticlesData.cpp b/src/obj/NiRotatingParticlesData.cpp
index 6f4a482bdac3d31c20a9283bb4cd5d1b24fc96ae..f31a2c91bfd388f4063ee5f7e37cc770ae779316 100644
--- a/src/obj/NiRotatingParticlesData.cpp
+++ b/src/obj/NiRotatingParticlesData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiRotatingParticlesData::TYPE("NiRotatingParticlesData", &NI_ROTATING_PARTICLES_DATA_PARENT::TypeConst() );
+const Type NiRotatingParticlesData::TYPE("NiRotatingParticlesData", &NI_ROTATING_PARTICLES_DATA_PARENT::TYPE );
 
 NiRotatingParticlesData::NiRotatingParticlesData() NI_ROTATING_PARTICLES_DATA_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiRotatingParticlesData::GetRefs() const {
 const Type & NiRotatingParticlesData::GetType() const {
 	return TYPE;
 };
-
-const Type & NiRotatingParticlesData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiScreenLODData.cpp b/src/obj/NiScreenLODData.cpp
index c698240888cc1647a33343e3b80a8d33e4d0e6c6..b6a0eb98dbdebb84616fbefc1eb5b972416686b6 100644
--- a/src/obj/NiScreenLODData.cpp
+++ b/src/obj/NiScreenLODData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiScreenLODData::TYPE("NiScreenLODData", &NI_SCREEN_L_O_D_DATA_PARENT::TypeConst() );
+const Type NiScreenLODData::TYPE("NiScreenLODData", &NI_SCREEN_L_O_D_DATA_PARENT::TYPE );
 
 NiScreenLODData::NiScreenLODData() NI_SCREEN_L_O_D_DATA_CONSTRUCT {}
 
@@ -74,7 +74,3 @@ vector<float > NiScreenLODData::GetProportionLevels() const {
 void NiScreenLODData::SetProportionLevels( const vector<float >& value ) {
 	proportionLevels = value;
 }
-
-const Type & NiScreenLODData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiSequenceStreamHelper.cpp b/src/obj/NiSequenceStreamHelper.cpp
index 3976c0f8322d972990bf5c9f6d93bef33a7b02ee..add79c3400c0f2f4b2c81fcbb3961955203dc6bf 100644
--- a/src/obj/NiSequenceStreamHelper.cpp
+++ b/src/obj/NiSequenceStreamHelper.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiSequenceStreamHelper::TYPE("NiSequenceStreamHelper", &NI_SEQUENCE_STREAM_HELPER_PARENT::TypeConst() );
+const Type NiSequenceStreamHelper::TYPE("NiSequenceStreamHelper", &NI_SEQUENCE_STREAM_HELPER_PARENT::TYPE );
 
 NiSequenceStreamHelper::NiSequenceStreamHelper() NI_SEQUENCE_STREAM_HELPER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiSequenceStreamHelper::GetRefs() const {
 const Type & NiSequenceStreamHelper::GetType() const {
 	return TYPE;
 };
-
-const Type & NiSequenceStreamHelper::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiShadeProperty.cpp b/src/obj/NiShadeProperty.cpp
index aa95e9cf00f6bbf8332eb90752ce30a7e582f68c..8e6e3232ef14effc82d9e1d9b4dfe0813980c0d2 100644
--- a/src/obj/NiShadeProperty.cpp
+++ b/src/obj/NiShadeProperty.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiShadeProperty::TYPE("NiShadeProperty", &NI_SHADE_PROPERTY_PARENT::TypeConst() );
+const Type NiShadeProperty::TYPE("NiShadeProperty", &NI_SHADE_PROPERTY_PARENT::TYPE );
 
 NiShadeProperty::NiShadeProperty() NI_SHADE_PROPERTY_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ unsigned short NiShadeProperty::GetFlags() const {
 void NiShadeProperty::SetFlags( unsigned short n ) {
    flags = n;
 }
-
-const Type & NiShadeProperty::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiSingleInterpolatorController.cpp b/src/obj/NiSingleInterpolatorController.cpp
index 9d8baffb3461a2fc02cdd2f5a259cf19680d14bb..f8ddeab05af6473e81beccc65e9e7823ce8b2ab5 100644
--- a/src/obj/NiSingleInterpolatorController.cpp
+++ b/src/obj/NiSingleInterpolatorController.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiSingleInterpolatorController::TYPE("NiSingleInterpolatorController", &NI_SINGLE_INTERPOLATOR_CONTROLLER_PARENT::TypeConst() );
+const Type NiSingleInterpolatorController::TYPE("NiSingleInterpolatorController", &NI_SINGLE_INTERPOLATOR_CONTROLLER_PARENT::TYPE );
 
 NiSingleInterpolatorController::NiSingleInterpolatorController() NI_SINGLE_INTERPOLATOR_CONTROLLER_CONSTRUCT {}
 
@@ -43,7 +43,3 @@ Ref<NiInterpolator > NiSingleInterpolatorController::GetInterpolator() const {
 void NiSingleInterpolatorController::SetInterpolator( NiInterpolator * value ) {
 	interpolator = value;
 }
-
-const Type & NiSingleInterpolatorController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiSkinData.cpp b/src/obj/NiSkinData.cpp
index 7dc4c31a5c439d17b4fb9ba2feed808d90d4d1c9..897417b192eeaced95422f1c9c2d529140028760 100644
--- a/src/obj/NiSkinData.cpp
+++ b/src/obj/NiSkinData.cpp
@@ -11,7 +11,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiSkinData::TYPE("NiSkinData", &NI_SKIN_DATA_PARENT::TypeConst() );
+const Type NiSkinData::TYPE("NiSkinData", &NI_SKIN_DATA_PARENT::TYPE );
 
 NiSkinData::NiSkinData() NI_SKIN_DATA_CONSTRUCT {}
 
@@ -170,7 +170,3 @@ Ref<NiSkinPartition> NiSkinData::GetSkinPartition() const {
 void NiSkinData::SetSkinPartition( NiSkinPartition * value ) {
    skinPartition = value;
 }
-
-const Type & NiSkinData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiSkinInstance.cpp b/src/obj/NiSkinInstance.cpp
index cadbcb7e5418b3c4ea87449b5f7ce10fa3696aa6..d4a9bb8360682115c598bc6fff6aa0d5f27e7d3b 100644
--- a/src/obj/NiSkinInstance.cpp
+++ b/src/obj/NiSkinInstance.cpp
@@ -9,7 +9,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiSkinInstance::TYPE("NiSkinInstance", &NI_SKIN_INSTANCE_PARENT::TypeConst() );
+const Type NiSkinInstance::TYPE("NiSkinInstance", &NI_SKIN_INSTANCE_PARENT::TYPE );
 
 NiSkinInstance::NiSkinInstance() NI_SKIN_INSTANCE_CONSTRUCT {}
 
@@ -135,7 +135,3 @@ unsigned int NiSkinInstance::GetBoneCount() const {
 Ref<NiNode> NiSkinInstance::GetSkeletonRoot() const {
 	return skeletonRoot;
 }
-
-const Type & NiSkinInstance::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiSkinPartition.cpp b/src/obj/NiSkinPartition.cpp
index 4b72f85100a51a4e1d0c93907873238ca11e1136..c4c59c0ac783ef0050538c4de466c3f70f23cbe5 100644
--- a/src/obj/NiSkinPartition.cpp
+++ b/src/obj/NiSkinPartition.cpp
@@ -26,7 +26,7 @@ typedef SkinPartition Partition;
 typedef vector<SkinPartition > PartitionList;
 
 //Definition of TYPE constant
-const Type NiSkinPartition::TYPE("NiSkinPartition", &NI_SKIN_PARTITION_PARENT::TypeConst() );
+const Type NiSkinPartition::TYPE("NiSkinPartition", &NI_SKIN_PARTITION_PARENT::TYPE );
 
 NiSkinPartition::NiSkinPartition() NI_SKIN_PARTITION_CONSTRUCT {}
 
@@ -715,7 +715,3 @@ NiSkinPartition::NiSkinPartition(Ref<NiTriBasedGeom> shape, int maxBonesPerParti
       }
    }
 }
-
-const Type & NiSkinPartition::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiSourceTexture.cpp b/src/obj/NiSourceTexture.cpp
index 2f0cd85811649de936e8703e8b89ad665fb036f9..7e2b318594737b0cb63e928f7028b4b9bf15aacb 100644
--- a/src/obj/NiSourceTexture.cpp
+++ b/src/obj/NiSourceTexture.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiSourceTexture::TYPE("NiSourceTexture", &NI_SOURCE_TEXTURE_PARENT::TypeConst() );
+const Type NiSourceTexture::TYPE("NiSourceTexture", &NI_SOURCE_TEXTURE_PARENT::TYPE );
 
 NiSourceTexture::NiSourceTexture() NI_SOURCE_TEXTURE_CONSTRUCT {}
 
@@ -95,7 +95,3 @@ AlphaFormat NiSourceTexture::GetAlphaFormat() const {
 void NiSourceTexture::SetAlphaFormat( AlphaFormat n ) {
 	alphaFormat = n;
 }
-
-const Type & NiSourceTexture::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiSpecularProperty.cpp b/src/obj/NiSpecularProperty.cpp
index 35e020a6057683c0b951918bf3e0ae579b1c1b23..29c197f27afd0e5138672dad8d6abe2531ebb8a4 100644
--- a/src/obj/NiSpecularProperty.cpp
+++ b/src/obj/NiSpecularProperty.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiSpecularProperty::TYPE("NiSpecularProperty", &NI_SPECULAR_PROPERTY_PARENT::TypeConst() );
+const Type NiSpecularProperty::TYPE("NiSpecularProperty", &NI_SPECULAR_PROPERTY_PARENT::TYPE );
 
 NiSpecularProperty::NiSpecularProperty() NI_SPECULAR_PROPERTY_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ unsigned short NiSpecularProperty::GetFlags() const {
 void NiSpecularProperty::SetFlags( unsigned short n ) {
    flags = n;
 }
-
-const Type & NiSpecularProperty::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiSphericalCollider.cpp b/src/obj/NiSphericalCollider.cpp
index d9ff0066e2b52e814cad3932df19273ece86b949..157b92e36f474f9ee0731d00e5c853e94ea19771 100644
--- a/src/obj/NiSphericalCollider.cpp
+++ b/src/obj/NiSphericalCollider.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiSphericalCollider::TYPE("NiSphericalCollider", &NI_SPHERICAL_COLLIDER_PARENT::TypeConst() );
+const Type NiSphericalCollider::TYPE("NiSphericalCollider", &NI_SPHERICAL_COLLIDER_PARENT::TYPE );
 
 NiSphericalCollider::NiSphericalCollider() NI_SPHERICAL_COLLIDER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiSphericalCollider::GetRefs() const {
 const Type & NiSphericalCollider::GetType() const {
 	return TYPE;
 };
-
-const Type & NiSphericalCollider::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiSpotLight.cpp b/src/obj/NiSpotLight.cpp
index 164b9174ad1ed0daa247112b0862cc387368c2a9..5abbc835ad993641bc9098376a9a875c83786316 100644
--- a/src/obj/NiSpotLight.cpp
+++ b/src/obj/NiSpotLight.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiSpotLight::TYPE("NiSpotLight", &NI_SPOT_LIGHT_PARENT::TypeConst() );
+const Type NiSpotLight::TYPE("NiSpotLight", &NI_SPOT_LIGHT_PARENT::TYPE );
 
 NiSpotLight::NiSpotLight() NI_SPOT_LIGHT_CONSTRUCT {}
 
@@ -50,7 +50,3 @@ float NiSpotLight::GetExponent() const {
 void NiSpotLight::SetExponent( float value ) {
 	exponent = value;
 }
-
-const Type & NiSpotLight::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiStencilProperty.cpp b/src/obj/NiStencilProperty.cpp
index 86c53e4675f7c05a103bd61d5be83575d22bb50c..fe245bbb9111902673f597d89cff5268b98e1b02 100644
--- a/src/obj/NiStencilProperty.cpp
+++ b/src/obj/NiStencilProperty.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiStencilProperty::TYPE("NiStencilProperty", &NI_STENCIL_PROPERTY_PARENT::TypeConst() );
+const Type NiStencilProperty::TYPE("NiStencilProperty", &NI_STENCIL_PROPERTY_PARENT::TYPE );
 
 NiStencilProperty::NiStencilProperty() NI_STENCIL_PROPERTY_CONSTRUCT {}
 
@@ -106,7 +106,3 @@ FaceDrawMode NiStencilProperty::GetFaceDrawMode() const {
 void NiStencilProperty::SetFaceDrawMode(FaceDrawMode value) {
    drawMode = value;
 }
-
-const Type & NiStencilProperty::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiStringExtraData.cpp b/src/obj/NiStringExtraData.cpp
index d26406592b6404762469162e96c8915ea2467358..86942535a3b8e244fb3a8d6da313c7d8a269cd0d 100644
--- a/src/obj/NiStringExtraData.cpp
+++ b/src/obj/NiStringExtraData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiStringExtraData::TYPE("NiStringExtraData", &NI_STRING_EXTRA_DATA_PARENT::TypeConst() );
+const Type NiStringExtraData::TYPE("NiStringExtraData", &NI_STRING_EXTRA_DATA_PARENT::TYPE );
 
 NiStringExtraData::NiStringExtraData() NI_STRING_EXTRA_DATA_CONSTRUCT {}
 
@@ -43,7 +43,3 @@ void NiStringExtraData::SetData( const string & n ) {
 	stringData = n;
 	bytesRemaining = (unsigned int)(stringData.size()) + 4;
 }
-
-const Type & NiStringExtraData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiStringPalette.cpp b/src/obj/NiStringPalette.cpp
index a513746fae0309ebc1a2b842243f5100136438ab..4bc3e0db6e2a31e7573deee2feb9efd4e65592f3 100644
--- a/src/obj/NiStringPalette.cpp
+++ b/src/obj/NiStringPalette.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiStringPalette::TYPE("NiStringPalette", &NI_STRING_PALETTE_PARENT::TypeConst() );
+const Type NiStringPalette::TYPE("NiStringPalette", &NI_STRING_PALETTE_PARENT::TYPE );
 
 NiStringPalette::NiStringPalette() NI_STRING_PALETTE_CONSTRUCT {}
 
@@ -76,7 +76,3 @@ unsigned int NiStringPalette::AddSubStr( const string & n ) {
 	//Return the offset where the string was found or appended
 	return offset;
 }
-
-const Type & NiStringPalette::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiStringsExtraData.cpp b/src/obj/NiStringsExtraData.cpp
index 4581ef56eb85cd5f8f5f3ccce7d5679e07744a65..f0dc77686c2e3294cb02d74cf2bd7619239aa911 100644
--- a/src/obj/NiStringsExtraData.cpp
+++ b/src/obj/NiStringsExtraData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiStringsExtraData::TYPE("NiStringsExtraData", &NI_STRINGS_EXTRA_DATA_PARENT::TypeConst() );
+const Type NiStringsExtraData::TYPE("NiStringsExtraData", &NI_STRINGS_EXTRA_DATA_PARENT::TYPE );
 
 NiStringsExtraData::NiStringsExtraData() NI_STRINGS_EXTRA_DATA_CONSTRUCT {}
 
@@ -43,7 +43,3 @@ void NiStringsExtraData::SetData( const vector<string> & n ) {
 	numStrings = (unsigned int)(n.size());
 	data = n;
 };
-
-const Type & NiStringsExtraData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTextKeyExtraData.cpp b/src/obj/NiTextKeyExtraData.cpp
index 7a3aefe778a7270d5ab36b0b733d3f830987581b..780e1014cefce6653d553aacbc566acfbef361c4 100644
--- a/src/obj/NiTextKeyExtraData.cpp
+++ b/src/obj/NiTextKeyExtraData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTextKeyExtraData::TYPE("NiTextKeyExtraData", &NI_TEXT_KEY_EXTRA_DATA_PARENT::TypeConst() );
+const Type NiTextKeyExtraData::TYPE("NiTextKeyExtraData", &NI_TEXT_KEY_EXTRA_DATA_PARENT::TYPE );
 
 NiTextKeyExtraData::NiTextKeyExtraData() NI_TEXT_KEY_EXTRA_DATA_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ vector< Key<string> > NiTextKeyExtraData::GetKeys() const {
 void NiTextKeyExtraData::SetKeys( vector< Key<string> > const & keys ) {
 	textKeys = keys;
 }
-
-const Type & NiTextKeyExtraData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTextureEffect.cpp b/src/obj/NiTextureEffect.cpp
index 835563397704171b0251d8465c256edf215207ea..9bf7a2e3186b9e10bde90a7a2df7e6e7a08abd3e 100644
--- a/src/obj/NiTextureEffect.cpp
+++ b/src/obj/NiTextureEffect.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTextureEffect::TYPE("NiTextureEffect", &NI_TEXTURE_EFFECT_PARENT::TypeConst() );
+const Type NiTextureEffect::TYPE("NiTextureEffect", &NI_TEXTURE_EFFECT_PARENT::TYPE );
 
 NiTextureEffect::NiTextureEffect() NI_TEXTURE_EFFECT_CONSTRUCT {}
 
@@ -115,7 +115,3 @@ unsigned short NiTextureEffect::GetPs2K() const {
 void NiTextureEffect::SetPs2K( unsigned short value ) {
 	ps2K = value;
 }
-
-const Type & NiTextureEffect::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTextureModeProperty.cpp b/src/obj/NiTextureModeProperty.cpp
index 77b098cedf085d705bec6e3e1e9c739388b46a60..cc3ceb0e136409676b5982b3714a2f6b4d77fa45 100644
--- a/src/obj/NiTextureModeProperty.cpp
+++ b/src/obj/NiTextureModeProperty.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTextureModeProperty::TYPE("NiTextureModeProperty", &NI_TEXTURE_MODE_PROPERTY_PARENT::TypeConst() );
+const Type NiTextureModeProperty::TYPE("NiTextureModeProperty", &NI_TEXTURE_MODE_PROPERTY_PARENT::TYPE );
 
 NiTextureModeProperty::NiTextureModeProperty() NI_TEXTURE_MODE_PROPERTY_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiTextureModeProperty::GetRefs() const {
 const Type & NiTextureModeProperty::GetType() const {
 	return TYPE;
 };
-
-const Type & NiTextureModeProperty::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTextureProperty.cpp b/src/obj/NiTextureProperty.cpp
index d72815079d1af2e633ee4962ae82619f241e48d6..e090cf5fb7f4e93484ab1b71ec50b23037635681 100644
--- a/src/obj/NiTextureProperty.cpp
+++ b/src/obj/NiTextureProperty.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTextureProperty::TYPE("NiTextureProperty", &NI_TEXTURE_PROPERTY_PARENT::TypeConst() );
+const Type NiTextureProperty::TYPE("NiTextureProperty", &NI_TEXTURE_PROPERTY_PARENT::TYPE );
 
 NiTextureProperty::NiTextureProperty() NI_TEXTURE_PROPERTY_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiTextureProperty::GetRefs() const {
 const Type & NiTextureProperty::GetType() const {
 	return TYPE;
 };
-
-const Type & NiTextureProperty::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTextureTransformController.cpp b/src/obj/NiTextureTransformController.cpp
index fd4382db68d41065f49b1c8e90055e82bb297e80..62d5eb71570b10568a913ba4bb4d9d036dbb243e 100644
--- a/src/obj/NiTextureTransformController.cpp
+++ b/src/obj/NiTextureTransformController.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTextureTransformController::TYPE("NiTextureTransformController", &NI_TEXTURE_TRANSFORM_CONTROLLER_PARENT::TypeConst() );
+const Type NiTextureTransformController::TYPE("NiTextureTransformController", &NI_TEXTURE_TRANSFORM_CONTROLLER_PARENT::TYPE );
 
 NiTextureTransformController::NiTextureTransformController() NI_TEXTURE_TRANSFORM_CONTROLLER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiTextureTransformController::GetRefs() const {
 const Type & NiTextureTransformController::GetType() const {
 	return TYPE;
 };
-
-const Type & NiTextureTransformController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTexturingProperty.cpp b/src/obj/NiTexturingProperty.cpp
index a8a588b17998eccbd248b31e8e588c0837821baa..3e3f16199e9eaeb2c5fe71ee84e8bd60a57a59af 100644
--- a/src/obj/NiTexturingProperty.cpp
+++ b/src/obj/NiTexturingProperty.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTexturingProperty::TYPE("NiTexturingProperty", &NI_TEXTURING_PROPERTY_PARENT::TypeConst() );
+const Type NiTexturingProperty::TYPE("NiTexturingProperty", &NI_TEXTURING_PROPERTY_PARENT::TYPE );
 
 NiTexturingProperty::NiTexturingProperty() NI_TEXTURING_PROPERTY_CONSTRUCT {}
 
@@ -245,7 +245,3 @@ void NiTexturingProperty::ClearTexture( int n ) {
 			break;
 	};
 }
-
-const Type & NiTexturingProperty::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTimeController.cpp b/src/obj/NiTimeController.cpp
index 5d580c2fd4e6e37e5e83d23697e7360e906b9f28..7f3e4235331ffce4fd6b7fda2e164def0de8a960 100644
--- a/src/obj/NiTimeController.cpp
+++ b/src/obj/NiTimeController.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTimeController::TYPE("NiTimeController", &NI_TIME_CONTROLLER_PARENT::TypeConst() );
+const Type NiTimeController::TYPE("NiTimeController", &NI_TIME_CONTROLLER_PARENT::TYPE );
 
 NiTimeController::NiTimeController() NI_TIME_CONTROLLER_CONSTRUCT {}
 
@@ -91,7 +91,3 @@ float NiTimeController::GetStopTime() const {
 void NiTimeController::SetStopTime( float n ) {
 	stopTime = n;
 }
-
-const Type & NiTimeController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTransformController.cpp b/src/obj/NiTransformController.cpp
index 742b31d1365613598478027c6d2a9a287a5e8b0a..eeec9b0c29ba6a63a8a6c77445482be2be0370a4 100644
--- a/src/obj/NiTransformController.cpp
+++ b/src/obj/NiTransformController.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTransformController::TYPE("NiTransformController", &NI_TRANSFORM_CONTROLLER_PARENT::TypeConst() );
+const Type NiTransformController::TYPE("NiTransformController", &NI_TRANSFORM_CONTROLLER_PARENT::TYPE );
 
 NiTransformController::NiTransformController() NI_TRANSFORM_CONTROLLER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiTransformController::GetRefs() const {
 const Type & NiTransformController::GetType() const {
 	return TYPE;
 };
-
-const Type & NiTransformController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTransformData.cpp b/src/obj/NiTransformData.cpp
index e6f56314097b84e7add9f8ddd963eba563474b86..cb360d51b12d5a3677a9aff8742ddf112b74ae43 100644
--- a/src/obj/NiTransformData.cpp
+++ b/src/obj/NiTransformData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTransformData::TYPE("NiTransformData", &NI_TRANSFORM_DATA_PARENT::TypeConst() );
+const Type NiTransformData::TYPE("NiTransformData", &NI_TRANSFORM_DATA_PARENT::TYPE );
 
 NiTransformData::NiTransformData() NI_TRANSFORM_DATA_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiTransformData::GetRefs() const {
 const Type & NiTransformData::GetType() const {
 	return TYPE;
 };
-
-const Type & NiTransformData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTransformInterpolator.cpp b/src/obj/NiTransformInterpolator.cpp
index 79f4694fcebcbf56f3078d895a94ef83874b475e..cd5a182631205f70ae9d25ce90aa18a65b5f5e3c 100644
--- a/src/obj/NiTransformInterpolator.cpp
+++ b/src/obj/NiTransformInterpolator.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTransformInterpolator::TYPE("NiTransformInterpolator", &NI_TRANSFORM_INTERPOLATOR_PARENT::TypeConst() );
+const Type NiTransformInterpolator::TYPE("NiTransformInterpolator", &NI_TRANSFORM_INTERPOLATOR_PARENT::TYPE );
 
 NiTransformInterpolator::NiTransformInterpolator() NI_TRANSFORM_INTERPOLATOR_CONSTRUCT {}
 
@@ -67,7 +67,3 @@ Ref<NiTransformData> NiTransformInterpolator::GetData() const {
 void NiTransformInterpolator::SetData( NiTransformData * value ) {
 	data = value;
 }
-
-const Type & NiTransformInterpolator::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTriBasedGeom.cpp b/src/obj/NiTriBasedGeom.cpp
index 8a217ace54eaa7991bf5ab5c28ebf6c3c532483c..95fb041f81f3ddb3f208909c4e52d8c13f69580c 100644
--- a/src/obj/NiTriBasedGeom.cpp
+++ b/src/obj/NiTriBasedGeom.cpp
@@ -12,7 +12,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTriBasedGeom::TYPE("NiTriBasedGeom", &NI_TRI_BASED_GEOM_PARENT::TypeConst() );
+const Type NiTriBasedGeom::TYPE("NiTriBasedGeom", &NI_TRI_BASED_GEOM_PARENT::TYPE );
 
 NiTriBasedGeom::NiTriBasedGeom() NI_TRI_BASED_GEOM_CONSTRUCT {}
 
@@ -230,7 +230,3 @@ void NiTriBasedGeom::UpdateTangentSpace() {
 
 	TSpaceRef->SetData(binData);
 }
-
-const Type & NiTriBasedGeom::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTriBasedGeomData.cpp b/src/obj/NiTriBasedGeomData.cpp
index 2cf8317aedb5bacc6cabec839248967822b60dd8..f0136aece2a96576badb725aa514ac00b99a0405 100644
--- a/src/obj/NiTriBasedGeomData.cpp
+++ b/src/obj/NiTriBasedGeomData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTriBasedGeomData::TYPE("NiTriBasedGeomData", &NI_TRI_BASED_GEOM_DATA_PARENT::TypeConst() );
+const Type NiTriBasedGeomData::TYPE("NiTriBasedGeomData", &NI_TRI_BASED_GEOM_DATA_PARENT::TYPE );
 
 NiTriBasedGeomData::NiTriBasedGeomData() NI_TRI_BASED_GEOM_DATA_CONSTRUCT {}
 
@@ -43,7 +43,3 @@ void NiTriBasedGeomData::SetTriangles( const vector<Triangle> & in ) {
 vector<Triangle> NiTriBasedGeomData::GetTriangles() const {
 	return vector<Triangle>();
 }  
-
-const Type & NiTriBasedGeomData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTriShape.cpp b/src/obj/NiTriShape.cpp
index 42744c1a361b063c0bfe88231d1d0cb3803414bb..203f53f74ae91db105bfb8ed6c800319a1d79dc7 100644
--- a/src/obj/NiTriShape.cpp
+++ b/src/obj/NiTriShape.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTriShape::TYPE("NiTriShape", &NI_TRI_SHAPE_PARENT::TypeConst() );
+const Type NiTriShape::TYPE("NiTriShape", &NI_TRI_SHAPE_PARENT::TYPE );
 
 NiTriShape::NiTriShape() NI_TRI_SHAPE_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiTriShape::GetRefs() const {
 const Type & NiTriShape::GetType() const {
 	return TYPE;
 };
-
-const Type & NiTriShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTriShapeData.cpp b/src/obj/NiTriShapeData.cpp
index 4cdba1d373fb926401e914de533a63ab5514c8b6..ff91cf5a8d23f4be132932a83ed803e93213801a 100644
--- a/src/obj/NiTriShapeData.cpp
+++ b/src/obj/NiTriShapeData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTriShapeData::TYPE("NiTriShapeData", &NI_TRI_SHAPE_DATA_PARENT::TypeConst() );
+const Type NiTriShapeData::TYPE("NiTriShapeData", &NI_TRI_SHAPE_DATA_PARENT::TYPE );
 
 NiTriShapeData::NiTriShapeData() NI_TRI_SHAPE_DATA_CONSTRUCT {}
 
@@ -92,7 +92,3 @@ void NiTriShapeData::SetTriangles( const vector<Triangle> & in ) {
 	//Set number of trianble points to the number of triangles times 3
 	numTrianglePoints = numTriangles * 3;
 }
-
-const Type & NiTriShapeData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTriStrips.cpp b/src/obj/NiTriStrips.cpp
index 582dba1134af8786e60e15681af2e239dc1a50b7..e7821391b0a736e9f8653a33592f71c8cdd2da17 100644
--- a/src/obj/NiTriStrips.cpp
+++ b/src/obj/NiTriStrips.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiTriStrips::TYPE("NiTriStrips", &NI_TRI_STRIPS_PARENT::TypeConst() );
+const Type NiTriStrips::TYPE("NiTriStrips", &NI_TRI_STRIPS_PARENT::TYPE );
 
 NiTriStrips::NiTriStrips() NI_TRI_STRIPS_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiTriStrips::GetRefs() const {
 const Type & NiTriStrips::GetType() const {
 	return TYPE;
 };
-
-const Type & NiTriStrips::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiTriStripsData.cpp b/src/obj/NiTriStripsData.cpp
index cd5051e14243325828d3329b2022754971ab85a8..c653ad42ba1e4a7a3aec9d7e36c7f4cd290e8a6e 100644
--- a/src/obj/NiTriStripsData.cpp
+++ b/src/obj/NiTriStripsData.cpp
@@ -15,7 +15,7 @@ typedef	list<TriStrip> TriStrips;
 
 
 //Definition of TYPE constant
-const Type NiTriStripsData::TYPE("NiTriStripsData", &NI_TRI_STRIPS_DATA_PARENT::TypeConst() );
+const Type NiTriStripsData::TYPE("NiTriStripsData", &NI_TRI_STRIPS_DATA_PARENT::TYPE );
 
 NiTriStripsData::NiTriStripsData() NI_TRI_STRIPS_DATA_CONSTRUCT {}
 
@@ -267,7 +267,3 @@ void NiTriStripsData::SetTSTriangles( const vector<Triangle> & in ) {
    //Recalculate Triangle Count
    numTriangles = CalcTriangleCount();
 }
-
-const Type & NiTriStripsData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiUVController.cpp b/src/obj/NiUVController.cpp
index d9d1df80abadf54b213c6b7010d2dded962bfb93..99af5f091838871ec488dc10ba6d43e7a8c9aaa6 100644
--- a/src/obj/NiUVController.cpp
+++ b/src/obj/NiUVController.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiUVController::TYPE("NiUVController", &NI_U_V_CONTROLLER_PARENT::TypeConst() );
+const Type NiUVController::TYPE("NiUVController", &NI_U_V_CONTROLLER_PARENT::TYPE );
 
 NiUVController::NiUVController() NI_U_V_CONTROLLER_CONSTRUCT {}
 
@@ -43,7 +43,3 @@ Ref<NiUVData> NiUVController::GetData() const {
 void NiUVController::SetData( NiUVData * n ) {
 	data = n;
 }
-
-const Type & NiUVController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiUVData.cpp b/src/obj/NiUVData.cpp
index 4c83a476e0ffab2c4c4e47990ba21bcb40f052f0..6ac41393fc3c7c786428446c4ff9a16d417f3cd1 100644
--- a/src/obj/NiUVData.cpp
+++ b/src/obj/NiUVData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiUVData::TYPE("NiUVData", &NI_U_V_DATA_PARENT::TypeConst() );
+const Type NiUVData::TYPE("NiUVData", &NI_U_V_DATA_PARENT::TYPE );
 
 NiUVData::NiUVData() NI_U_V_DATA_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiUVData::GetRefs() const {
 const Type & NiUVData::GetType() const {
 	return TYPE;
 };
-
-const Type & NiUVData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiVectorExtraData.cpp b/src/obj/NiVectorExtraData.cpp
index 4d6526b6c6f37111dc38de5e612d166190349453..f0e81827de4f7c8aac4e67380889d1474a043f60 100644
--- a/src/obj/NiVectorExtraData.cpp
+++ b/src/obj/NiVectorExtraData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiVectorExtraData::TYPE("NiVectorExtraData", &NI_VECTOR_EXTRA_DATA_PARENT::TypeConst() );
+const Type NiVectorExtraData::TYPE("NiVectorExtraData", &NI_VECTOR_EXTRA_DATA_PARENT::TYPE );
 
 NiVectorExtraData::NiVectorExtraData() NI_VECTOR_EXTRA_DATA_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ Vector3 NiVectorExtraData::GetData() const {
 void NiVectorExtraData::SetData( const Vector3 & n ) {
 	vectorData = n;
 };
-
-const Type & NiVectorExtraData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiVertWeightsExtraData.cpp b/src/obj/NiVertWeightsExtraData.cpp
index 29bc214be488da789dd03d0fcf653bbae553a37c..9459f331113ca98ea4b64ee37935420b941ab10e 100644
--- a/src/obj/NiVertWeightsExtraData.cpp
+++ b/src/obj/NiVertWeightsExtraData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiVertWeightsExtraData::TYPE("NiVertWeightsExtraData", &NI_VERT_WEIGHTS_EXTRA_DATA_PARENT::TypeConst() );
+const Type NiVertWeightsExtraData::TYPE("NiVertWeightsExtraData", &NI_VERT_WEIGHTS_EXTRA_DATA_PARENT::TYPE );
 
 NiVertWeightsExtraData::NiVertWeightsExtraData() NI_VERT_WEIGHTS_EXTRA_DATA_CONSTRUCT {}
 
@@ -44,7 +44,3 @@ void NiVertWeightsExtraData::SetData( const vector<float> & n ) {
 	numBytes = numVertices + 2;
 	weight = n;
 }
-
-const Type & NiVertWeightsExtraData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiVertexColorProperty.cpp b/src/obj/NiVertexColorProperty.cpp
index bb77488988383c212dae4e895de8efc98ed0442f..f209e5fd3ee9d871ec777413da9efdcfb919321c 100644
--- a/src/obj/NiVertexColorProperty.cpp
+++ b/src/obj/NiVertexColorProperty.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiVertexColorProperty::TYPE("NiVertexColorProperty", &NI_VERTEX_COLOR_PROPERTY_PARENT::TypeConst() );
+const Type NiVertexColorProperty::TYPE("NiVertexColorProperty", &NI_VERTEX_COLOR_PROPERTY_PARENT::TYPE );
 
 NiVertexColorProperty::NiVertexColorProperty() NI_VERTEX_COLOR_PROPERTY_CONSTRUCT {}
 
@@ -58,7 +58,3 @@ LightMode NiVertexColorProperty::GetLightingMode() const {
 void NiVertexColorProperty::SetLightingMode(LightMode value) {
    lightingMode = value;
 }
-
-const Type & NiVertexColorProperty::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiVisController.cpp b/src/obj/NiVisController.cpp
index fdd4c95a8f065c01631fcf2466e1c0a5b4e6dd99..7b8b30010f3b8cc2a50c424c3e9cc80b7beab2c4 100644
--- a/src/obj/NiVisController.cpp
+++ b/src/obj/NiVisController.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiVisController::TYPE("NiVisController", &NI_VIS_CONTROLLER_PARENT::TypeConst() );
+const Type NiVisController::TYPE("NiVisController", &NI_VIS_CONTROLLER_PARENT::TYPE );
 
 NiVisController::NiVisController() NI_VIS_CONTROLLER_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> NiVisController::GetRefs() const {
 const Type & NiVisController::GetType() const {
 	return TYPE;
 };
-
-const Type & NiVisController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiVisData.cpp b/src/obj/NiVisData.cpp
index 963ce87c6bfacaa508e9c645ecffcc5c9bf032d4..6052f99f7deaa5d72fa5c5503ff07a6f22ebe075 100644
--- a/src/obj/NiVisData.cpp
+++ b/src/obj/NiVisData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiVisData::TYPE("NiVisData", &NI_VIS_DATA_PARENT::TypeConst() );
+const Type NiVisData::TYPE("NiVisData", &NI_VIS_DATA_PARENT::TYPE );
 
 NiVisData::NiVisData() NI_VIS_DATA_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> NiVisData::GetRefs() const {
 const Type & NiVisData::GetType() const {
 	return TYPE;
 };
-
-const Type & NiVisData::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/NiWireframeProperty.cpp b/src/obj/NiWireframeProperty.cpp
index 33ee8f19f332f1db88882f69a5e616b678a80fff..08bba7ce18159006e5e6e944bfc90642da6e6145 100644
--- a/src/obj/NiWireframeProperty.cpp
+++ b/src/obj/NiWireframeProperty.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiWireframeProperty::TYPE("NiWireframeProperty", &NI_WIREFRAME_PROPERTY_PARENT::TypeConst() );
+const Type NiWireframeProperty::TYPE("NiWireframeProperty", &NI_WIREFRAME_PROPERTY_PARENT::TYPE );
 
 NiWireframeProperty::NiWireframeProperty() NI_WIREFRAME_PROPERTY_CONSTRUCT {}
 
@@ -42,8 +42,3 @@ unsigned short NiWireframeProperty::GetFlags() const {
 void NiWireframeProperty::SetFlags(unsigned short value) {
    flags = value;
 }
-
-const Type & NiWireframeProperty::TypeConst() {
-	return TYPE;
-}
-
diff --git a/src/obj/NiZBufferProperty.cpp b/src/obj/NiZBufferProperty.cpp
index 700e294d4fa0c6fb2dc2491cdc37cee50e2e04af..0bdcfa68c54f886657e84967e8f2b357119222cb 100644
--- a/src/obj/NiZBufferProperty.cpp
+++ b/src/obj/NiZBufferProperty.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type NiZBufferProperty::TYPE("NiZBufferProperty", &NI_Z_BUFFER_PROPERTY_PARENT::TypeConst() );
+const Type NiZBufferProperty::TYPE("NiZBufferProperty", &NI_Z_BUFFER_PROPERTY_PARENT::TYPE );
 
 NiZBufferProperty::NiZBufferProperty() NI_Z_BUFFER_PROPERTY_CONSTRUCT {}
 
@@ -50,7 +50,3 @@ CompareMode NiZBufferProperty::GetDepthFunction() const {
 void NiZBufferProperty::SetDepthFunction(CompareMode value) {
    function = value;
 }
-
-const Type & NiZBufferProperty::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/RootCollisionNode.cpp b/src/obj/RootCollisionNode.cpp
index 3efffc9893ac388d605016ad4a2885c4bfbff17e..ab9e2fdb66e3737005675e02a27b0db67bfe1e2c 100644
--- a/src/obj/RootCollisionNode.cpp
+++ b/src/obj/RootCollisionNode.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type RootCollisionNode::TYPE("RootCollisionNode", &ROOT_COLLISION_NODE_PARENT::TypeConst() );
+const Type RootCollisionNode::TYPE("RootCollisionNode", &ROOT_COLLISION_NODE_PARENT::TYPE );
 
 RootCollisionNode::RootCollisionNode() ROOT_COLLISION_NODE_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> RootCollisionNode::GetRefs() const {
 const Type & RootCollisionNode::GetType() const {
 	return TYPE;
 };
-
-const Type & RootCollisionNode::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkBlendCollisionObject.cpp b/src/obj/bhkBlendCollisionObject.cpp
index b6881e6e5d0f34313459e6506923d702d0c1aefc..1e4c827bda16cc78f3caff0226722670c9334bf7 100644
--- a/src/obj/bhkBlendCollisionObject.cpp
+++ b/src/obj/bhkBlendCollisionObject.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkBlendCollisionObject::TYPE("bhkBlendCollisionObject", &BHK_BLEND_COLLISION_OBJECT_PARENT::TypeConst() );
+const Type bhkBlendCollisionObject::TYPE("bhkBlendCollisionObject", &BHK_BLEND_COLLISION_OBJECT_PARENT::TYPE );
 
 bhkBlendCollisionObject::bhkBlendCollisionObject() BHK_BLEND_COLLISION_OBJECT_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkBlendCollisionObject::GetRefs() const {
 const Type & bhkBlendCollisionObject::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkBlendCollisionObject::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkBlendController.cpp b/src/obj/bhkBlendController.cpp
index f224d66aa97c6173610936dd1dbcbd1a598fcef5..4a9513f71b6251ffc5e63c23137934c8ecdf855e 100644
--- a/src/obj/bhkBlendController.cpp
+++ b/src/obj/bhkBlendController.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkBlendController::TYPE("bhkBlendController", &BHK_BLEND_CONTROLLER_PARENT::TypeConst() );
+const Type bhkBlendController::TYPE("bhkBlendController", &BHK_BLEND_CONTROLLER_PARENT::TYPE );
 
 bhkBlendController::bhkBlendController() BHK_BLEND_CONTROLLER_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkBlendController::GetRefs() const {
 const Type & bhkBlendController::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkBlendController::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkBoxShape.cpp b/src/obj/bhkBoxShape.cpp
index ceabc9ada2a893e7b2fac046ca2057bea5259263..23bc0c1ef2667a5d3b707fd7aacb9d17b04ca101 100644
--- a/src/obj/bhkBoxShape.cpp
+++ b/src/obj/bhkBoxShape.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkBoxShape::TYPE("bhkBoxShape", &BHK_BOX_SHAPE_PARENT::TypeConst() );
+const Type bhkBoxShape::TYPE("bhkBoxShape", &BHK_BOX_SHAPE_PARENT::TYPE );
 
 bhkBoxShape::bhkBoxShape() BHK_BOX_SHAPE_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ Vector3 bhkBoxShape::GetDimensions() const {
 void bhkBoxShape::SetDimensions(const Vector3 &value) {
 	dimensions = value;
 }
-
-const Type & bhkBoxShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkCapsuleShape.cpp b/src/obj/bhkCapsuleShape.cpp
index 5fc4801834aeb3de9c54ea0b74078da1644dad49..bf4c62e3a440a4d5ff867d301bcfaa6d281c3cd8 100644
--- a/src/obj/bhkCapsuleShape.cpp
+++ b/src/obj/bhkCapsuleShape.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkCapsuleShape::TYPE("bhkCapsuleShape", &BHK_CAPSULE_SHAPE_PARENT::TypeConst() );
+const Type bhkCapsuleShape::TYPE("bhkCapsuleShape", &BHK_CAPSULE_SHAPE_PARENT::TYPE );
 
 bhkCapsuleShape::bhkCapsuleShape() BHK_CAPSULE_SHAPE_CONSTRUCT {}
 
@@ -74,7 +74,3 @@ float bhkCapsuleShape::GetRadius2() const {
 void bhkCapsuleShape::SetRadius2( float value ) {
 	radius2 = value;
 }
-
-const Type & bhkCapsuleShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkCollisionObject.cpp b/src/obj/bhkCollisionObject.cpp
index 478087475e6fca217e81dfae91f88b80cbbca586..080fcfe491b0cea500c54f4c15653da302658f4c 100644
--- a/src/obj/bhkCollisionObject.cpp
+++ b/src/obj/bhkCollisionObject.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkCollisionObject::TYPE("bhkCollisionObject", &BHK_COLLISION_OBJECT_PARENT::TypeConst() );
+const Type bhkCollisionObject::TYPE("bhkCollisionObject", &BHK_COLLISION_OBJECT_PARENT::TYPE );
 
 bhkCollisionObject::bhkCollisionObject() BHK_COLLISION_OBJECT_CONSTRUCT {}
 
@@ -37,7 +37,3 @@ list<NiObjectRef> bhkCollisionObject::GetRefs() const {
 const Type & bhkCollisionObject::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkCollisionObject::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkConvexShape.cpp b/src/obj/bhkConvexShape.cpp
index bfd811a1f398517da829d6f14c710d2026ffc64b..a57db828bca5aea1e103fc0e759177307c116d01 100644
--- a/src/obj/bhkConvexShape.cpp
+++ b/src/obj/bhkConvexShape.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkConvexShape::TYPE("bhkConvexShape", &BHK_CONVEX_SHAPE_PARENT::TypeConst() );
+const Type bhkConvexShape::TYPE("bhkConvexShape", &BHK_CONVEX_SHAPE_PARENT::TYPE );
 
 bhkConvexShape::bhkConvexShape() BHK_CONVEX_SHAPE_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkConvexShape::GetRefs() const {
 const Type & bhkConvexShape::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkConvexShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkConvexTransformShape.cpp b/src/obj/bhkConvexTransformShape.cpp
index 9581d2c8498664986bfd4b83af03b88e287b80a0..3ade18e946365666f5710c6ce2f7838b0b9ce41c 100644
--- a/src/obj/bhkConvexTransformShape.cpp
+++ b/src/obj/bhkConvexTransformShape.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkConvexTransformShape::TYPE("bhkConvexTransformShape", &BHK_CONVEX_TRANSFORM_SHAPE_PARENT::TypeConst() );
+const Type bhkConvexTransformShape::TYPE("bhkConvexTransformShape", &BHK_CONVEX_TRANSFORM_SHAPE_PARENT::TYPE );
 
 bhkConvexTransformShape::bhkConvexTransformShape() BHK_CONVEX_TRANSFORM_SHAPE_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkConvexTransformShape::GetRefs() const {
 const Type & bhkConvexTransformShape::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkConvexTransformShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkConvexVerticesShape.cpp b/src/obj/bhkConvexVerticesShape.cpp
index 25f84aa0183ef672ca4e644dc2153ff9d242de39..63b17f3eb566bf6f37c1b6b983fe19482fb633ca 100644
--- a/src/obj/bhkConvexVerticesShape.cpp
+++ b/src/obj/bhkConvexVerticesShape.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkConvexVerticesShape::TYPE("bhkConvexVerticesShape", &BHK_CONVEX_VERTICES_SHAPE_PARENT::TypeConst() );
+const Type bhkConvexVerticesShape::TYPE("bhkConvexVerticesShape", &BHK_CONVEX_VERTICES_SHAPE_PARENT::TYPE );
 
 bhkConvexVerticesShape::bhkConvexVerticesShape() BHK_CONVEX_VERTICES_SHAPE_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkConvexVerticesShape::GetRefs() const {
 const Type & bhkConvexVerticesShape::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkConvexVerticesShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkEntity.cpp b/src/obj/bhkEntity.cpp
index 17c113ebe1cd2485144ecf285d328e661dfa8232..cf1a999844699e830d9155adb940e44568bee5c1 100644
--- a/src/obj/bhkEntity.cpp
+++ b/src/obj/bhkEntity.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkEntity::TYPE("bhkEntity", &BHK_ENTITY_PARENT::TypeConst() );
+const Type bhkEntity::TYPE("bhkEntity", &BHK_ENTITY_PARENT::TYPE );
 
 bhkEntity::bhkEntity() BHK_ENTITY_CONSTRUCT {}
 
@@ -51,7 +51,3 @@ OblivionLayer bhkEntity::GetLayer() const {
 void bhkEntity::SetLayer( OblivionLayer value ) {
 	layer = value;
 }
-
-const Type & bhkEntity::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkHingeConstraint.cpp b/src/obj/bhkHingeConstraint.cpp
index b0ed22c8a5eb702749c5f0b77f846719d8909662..5a04981e1367b9b63f9ddee1d4e75eff89fbfd59 100644
--- a/src/obj/bhkHingeConstraint.cpp
+++ b/src/obj/bhkHingeConstraint.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkHingeConstraint::TYPE("bhkHingeConstraint", &BHK_HINGE_CONSTRAINT_PARENT::TypeConst() );
+const Type bhkHingeConstraint::TYPE("bhkHingeConstraint", &BHK_HINGE_CONSTRAINT_PARENT::TYPE );
 
 bhkHingeConstraint::bhkHingeConstraint() BHK_HINGE_CONSTRAINT_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkHingeConstraint::GetRefs() const {
 const Type & bhkHingeConstraint::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkHingeConstraint::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkLimitedHingeConstraint.cpp b/src/obj/bhkLimitedHingeConstraint.cpp
index 94d40ad7d557b66611a4b9a948409669ac93dad6..a1b930bb2e3ddd3098274145ce9136009314cfdc 100644
--- a/src/obj/bhkLimitedHingeConstraint.cpp
+++ b/src/obj/bhkLimitedHingeConstraint.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkLimitedHingeConstraint::TYPE("bhkLimitedHingeConstraint", &BHK_LIMITED_HINGE_CONSTRAINT_PARENT::TypeConst() );
+const Type bhkLimitedHingeConstraint::TYPE("bhkLimitedHingeConstraint", &BHK_LIMITED_HINGE_CONSTRAINT_PARENT::TYPE );
 
 bhkLimitedHingeConstraint::bhkLimitedHingeConstraint() BHK_LIMITED_HINGE_CONSTRAINT_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> bhkLimitedHingeConstraint::GetRefs() const {
 const Type & bhkLimitedHingeConstraint::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkLimitedHingeConstraint::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkListShape.cpp b/src/obj/bhkListShape.cpp
index 45844e8caea80ce8ed5ab880dd45bdaac2351f81..693376c786e1d29ba32b2e76ea92d532f377be2a 100644
--- a/src/obj/bhkListShape.cpp
+++ b/src/obj/bhkListShape.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkListShape::TYPE("bhkListShape", &BHK_LIST_SHAPE_PARENT::TypeConst() );
+const Type bhkListShape::TYPE("bhkListShape", &BHK_LIST_SHAPE_PARENT::TYPE );
 
 bhkListShape::bhkListShape() BHK_LIST_SHAPE_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> bhkListShape::GetRefs() const {
 const Type & bhkListShape::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkListShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkMalleableConstraint.cpp b/src/obj/bhkMalleableConstraint.cpp
index 9b64467196b0aa2dc09543e27d0ddc9f64a9a480..14d60a2616cf636aefd1de987c516004b6e0f7a8 100644
--- a/src/obj/bhkMalleableConstraint.cpp
+++ b/src/obj/bhkMalleableConstraint.cpp
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkMalleableConstraint::TYPE("bhkMalleableConstraint", &BHK_MALLEABLE_CONSTRAINT_PARENT::TypeConst() );
+const Type bhkMalleableConstraint::TYPE("bhkMalleableConstraint", &BHK_MALLEABLE_CONSTRAINT_PARENT::TYPE );
 
 bhkMalleableConstraint::bhkMalleableConstraint() BHK_MALLEABLE_CONSTRAINT_CONSTRUCT {}
 
@@ -37,7 +37,3 @@ list<NiObjectRef> bhkMalleableConstraint::GetRefs() const {
 const Type & bhkMalleableConstraint::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkMalleableConstraint::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkMoppBvTreeShape.cpp b/src/obj/bhkMoppBvTreeShape.cpp
index ae8ee96b0ec6c35cdcfc92e27e6c2dd72969df18..1b9a286e25bf6f4769a4f4c424cb6bb38309ef36 100644
--- a/src/obj/bhkMoppBvTreeShape.cpp
+++ b/src/obj/bhkMoppBvTreeShape.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkMoppBvTreeShape::TYPE("bhkMoppBvTreeShape", &BHK_MOPP_BV_TREE_SHAPE_PARENT::TypeConst() );
+const Type bhkMoppBvTreeShape::TYPE("bhkMoppBvTreeShape", &BHK_MOPP_BV_TREE_SHAPE_PARENT::TYPE );
 
 bhkMoppBvTreeShape::bhkMoppBvTreeShape() BHK_MOPP_BV_TREE_SHAPE_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> bhkMoppBvTreeShape::GetRefs() const {
 const Type & bhkMoppBvTreeShape::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkMoppBvTreeShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkMultiSphereShape.cpp b/src/obj/bhkMultiSphereShape.cpp
index 4e6492e4940b6eef83d359cc821264beb046ff63..7f874f2392d8edf23611a1f4e6e78c2bb909b386 100644
--- a/src/obj/bhkMultiSphereShape.cpp
+++ b/src/obj/bhkMultiSphereShape.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkMultiSphereShape::TYPE("bhkMultiSphereShape", &BHK_MULTI_SPHERE_SHAPE_PARENT::TypeConst() );
+const Type bhkMultiSphereShape::TYPE("bhkMultiSphereShape", &BHK_MULTI_SPHERE_SHAPE_PARENT::TYPE );
 
 bhkMultiSphereShape::bhkMultiSphereShape() BHK_MULTI_SPHERE_SHAPE_CONSTRUCT {}
 
@@ -43,7 +43,3 @@ vector<Sphere > bhkMultiSphereShape::GetSpheres() const {
 void bhkMultiSphereShape::SetSpheres( const vector<Sphere >& value ) {
 	spheres = value;
 }
-
-const Type & bhkMultiSphereShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkNiTriStripsShape.cpp b/src/obj/bhkNiTriStripsShape.cpp
index 55d4ddeae1e5837cbb6e32a21f9c83d983948ee0..bd0ecb1ed04964a44baa783a1cf8a148e41edc6b 100644
--- a/src/obj/bhkNiTriStripsShape.cpp
+++ b/src/obj/bhkNiTriStripsShape.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkNiTriStripsShape::TYPE("bhkNiTriStripsShape", &BHK_NI_TRI_STRIPS_SHAPE_PARENT::TypeConst() );
+const Type bhkNiTriStripsShape::TYPE("bhkNiTriStripsShape", &BHK_NI_TRI_STRIPS_SHAPE_PARENT::TYPE );
 
 bhkNiTriStripsShape::bhkNiTriStripsShape() BHK_NI_TRI_STRIPS_SHAPE_CONSTRUCT {}
 
@@ -61,7 +61,3 @@ Vector3 bhkNiTriStripsShape::GetScale() const {
 void bhkNiTriStripsShape::SetScale( const Vector3 & n ) {
 	scale = n;	
 }
-
-const Type & bhkNiTriStripsShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkPackedNiTriStripsShape.cpp b/src/obj/bhkPackedNiTriStripsShape.cpp
index e1b01672b9b0b5327f5b2aca792247fb9133905c..94872df31545901ba4b82d9cf19d91033ad789d8 100644
--- a/src/obj/bhkPackedNiTriStripsShape.cpp
+++ b/src/obj/bhkPackedNiTriStripsShape.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkPackedNiTriStripsShape::TYPE("bhkPackedNiTriStripsShape", &BHK_PACKED_NI_TRI_STRIPS_SHAPE_PARENT::TypeConst() );
+const Type bhkPackedNiTriStripsShape::TYPE("bhkPackedNiTriStripsShape", &BHK_PACKED_NI_TRI_STRIPS_SHAPE_PARENT::TYPE );
 
 bhkPackedNiTriStripsShape::bhkPackedNiTriStripsShape() BHK_PACKED_NI_TRI_STRIPS_SHAPE_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> bhkPackedNiTriStripsShape::GetRefs() const {
 const Type & bhkPackedNiTriStripsShape::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkPackedNiTriStripsShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkPrismaticConstraint.cpp b/src/obj/bhkPrismaticConstraint.cpp
index 871b91956ecc787780ea68ffefa5daf36c9efcb4..aa861511164ee013cee1086922b71543a49f6128 100644
--- a/src/obj/bhkPrismaticConstraint.cpp
+++ b/src/obj/bhkPrismaticConstraint.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkPrismaticConstraint::TYPE("bhkPrismaticConstraint", &BHK_PRISMATIC_CONSTRAINT_PARENT::TypeConst() );
+const Type bhkPrismaticConstraint::TYPE("bhkPrismaticConstraint", &BHK_PRISMATIC_CONSTRAINT_PARENT::TYPE );
 
 bhkPrismaticConstraint::bhkPrismaticConstraint() BHK_PRISMATIC_CONSTRAINT_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkPrismaticConstraint::GetRefs() const {
 const Type & bhkPrismaticConstraint::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkPrismaticConstraint::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkRagdollConstraint.cpp b/src/obj/bhkRagdollConstraint.cpp
index e0122151d6066b82a1d6d4aa33b73432027805f7..3575fd9877809a9b384b0a2e8ef6b99963cd4210 100644
--- a/src/obj/bhkRagdollConstraint.cpp
+++ b/src/obj/bhkRagdollConstraint.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkRagdollConstraint::TYPE("bhkRagdollConstraint", &BHK_RAGDOLL_CONSTRAINT_PARENT::TypeConst() );
+const Type bhkRagdollConstraint::TYPE("bhkRagdollConstraint", &BHK_RAGDOLL_CONSTRAINT_PARENT::TYPE );
 
 bhkRagdollConstraint::bhkRagdollConstraint() BHK_RAGDOLL_CONSTRAINT_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkRagdollConstraint::GetRefs() const {
 const Type & bhkRagdollConstraint::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkRagdollConstraint::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkRefObject.cpp b/src/obj/bhkRefObject.cpp
index 7e6ca99ad6b646177c04593c3fe4aeb53047fc6c..c70a0ce86384ed8e92a3acd2df340ca6876e1b98 100644
--- a/src/obj/bhkRefObject.cpp
+++ b/src/obj/bhkRefObject.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkRefObject::TYPE("bhkRefObject", &BHK_REF_OBJECT_PARENT::TypeConst() );
+const Type bhkRefObject::TYPE("bhkRefObject", &BHK_REF_OBJECT_PARENT::TYPE );
 
 bhkRefObject::bhkRefObject() BHK_REF_OBJECT_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkRefObject::GetRefs() const {
 const Type & bhkRefObject::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkRefObject::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkRigidBody.cpp b/src/obj/bhkRigidBody.cpp
index bd78307858e0aaea41fc52754e6959f97a3832d7..9e656ed0ac55dfe08e664f98bcb909218c1c8cf8 100644
--- a/src/obj/bhkRigidBody.cpp
+++ b/src/obj/bhkRigidBody.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkRigidBody::TYPE("bhkRigidBody", &BHK_RIGID_BODY_PARENT::TypeConst() );
+const Type bhkRigidBody::TYPE("bhkRigidBody", &BHK_RIGID_BODY_PARENT::TYPE );
 
 bhkRigidBody::bhkRigidBody() BHK_RIGID_BODY_CONSTRUCT {}
 
@@ -172,7 +172,3 @@ MotionQuality bhkRigidBody::GetQualityType() const {
 void bhkRigidBody::SetQualityType( MotionQuality value ) {
 	qualityType = value;
 }
-
-const Type & bhkRigidBody::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkRigidBodyT.cpp b/src/obj/bhkRigidBodyT.cpp
index 4d0d2b4e6c8faf27d9eee0d7b5db22f5224da340..eea636196de5a1d2dbc506f0944a07633d0554b7 100644
--- a/src/obj/bhkRigidBodyT.cpp
+++ b/src/obj/bhkRigidBodyT.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkRigidBodyT::TYPE("bhkRigidBodyT", &BHK_RIGID_BODY_T_PARENT::TypeConst() );
+const Type bhkRigidBodyT::TYPE("bhkRigidBodyT", &BHK_RIGID_BODY_T_PARENT::TYPE );
 
 bhkRigidBodyT::bhkRigidBodyT() BHK_RIGID_BODY_T_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkRigidBodyT::GetRefs() const {
 const Type & bhkRigidBodyT::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkRigidBodyT::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkSPCollisionObject.cpp b/src/obj/bhkSPCollisionObject.cpp
index 6f1135c7c8ed26a50a99d76968fa26505e377315..93ee2af78ba6138f9681196706063c3501376ab4 100644
--- a/src/obj/bhkSPCollisionObject.cpp
+++ b/src/obj/bhkSPCollisionObject.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkSPCollisionObject::TYPE("bhkSPCollisionObject", &BHK_S_P_COLLISION_OBJECT_PARENT::TypeConst() );
+const Type bhkSPCollisionObject::TYPE("bhkSPCollisionObject", &BHK_S_P_COLLISION_OBJECT_PARENT::TYPE );
 
 bhkSPCollisionObject::bhkSPCollisionObject() BHK_S_P_COLLISION_OBJECT_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkSPCollisionObject::GetRefs() const {
 const Type & bhkSPCollisionObject::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkSPCollisionObject::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkSerializable.cpp b/src/obj/bhkSerializable.cpp
index 3b237d165ec86ec61e133919a4d351594aaae077..bc169f38c76aa34bbef2f0ab170b04e56bf3f83d 100644
--- a/src/obj/bhkSerializable.cpp
+++ b/src/obj/bhkSerializable.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkSerializable::TYPE("bhkSerializable", &BHK_SERIALIZABLE_PARENT::TypeConst() );
+const Type bhkSerializable::TYPE("bhkSerializable", &BHK_SERIALIZABLE_PARENT::TYPE );
 
 bhkSerializable::bhkSerializable() BHK_SERIALIZABLE_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkSerializable::GetRefs() const {
 const Type & bhkSerializable::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkSerializable::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkShape.cpp b/src/obj/bhkShape.cpp
index fe837574f2155f0b1733ca85a826650086e2793d..9ecac5a2522da86ed53678d3276b4f0080bbcf1d 100644
--- a/src/obj/bhkShape.cpp
+++ b/src/obj/bhkShape.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkShape::TYPE("bhkShape", &BHK_SHAPE_PARENT::TypeConst() );
+const Type bhkShape::TYPE("bhkShape", &BHK_SHAPE_PARENT::TYPE );
 
 bhkShape::bhkShape() BHK_SHAPE_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkShape::GetRefs() const {
 const Type & bhkShape::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkSimpleShapePhantom.cpp b/src/obj/bhkSimpleShapePhantom.cpp
index f14831d75b4d86c1dcd3c96c82b4524b876e812e..22d012eb54c7bf37216b56e2fbd1b18b97941348 100644
--- a/src/obj/bhkSimpleShapePhantom.cpp
+++ b/src/obj/bhkSimpleShapePhantom.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkSimpleShapePhantom::TYPE("bhkSimpleShapePhantom", &BHK_SIMPLE_SHAPE_PHANTOM_PARENT::TypeConst() );
+const Type bhkSimpleShapePhantom::TYPE("bhkSimpleShapePhantom", &BHK_SIMPLE_SHAPE_PHANTOM_PARENT::TYPE );
 
 bhkSimpleShapePhantom::bhkSimpleShapePhantom() BHK_SIMPLE_SHAPE_PHANTOM_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkSimpleShapePhantom::GetRefs() const {
 const Type & bhkSimpleShapePhantom::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkSimpleShapePhantom::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkSphereRepShape.cpp b/src/obj/bhkSphereRepShape.cpp
index 28fc5066462d043d3ba05c46e01a47617a2b4093..a718646b58c3ca9764bf87cfe70795a354822f87 100644
--- a/src/obj/bhkSphereRepShape.cpp
+++ b/src/obj/bhkSphereRepShape.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkSphereRepShape::TYPE("bhkSphereRepShape", &BHK_SPHERE_REP_SHAPE_PARENT::TypeConst() );
+const Type bhkSphereRepShape::TYPE("bhkSphereRepShape", &BHK_SPHERE_REP_SHAPE_PARENT::TYPE );
 
 bhkSphereRepShape::bhkSphereRepShape() BHK_SPHERE_REP_SHAPE_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ HavokMaterial bhkSphereRepShape::GetMaterial() const {
 void bhkSphereRepShape::SetMaterial( HavokMaterial value ) {
 	material = value;
 }
-
-const Type & bhkSphereRepShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkSphereShape.cpp b/src/obj/bhkSphereShape.cpp
index e0404f5c196ee1be09c8c97582d7ec70afcc5056..253dbe5b35d681ce00828109bfdee4ccf96e7cf9 100644
--- a/src/obj/bhkSphereShape.cpp
+++ b/src/obj/bhkSphereShape.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkSphereShape::TYPE("bhkSphereShape", &BHK_SPHERE_SHAPE_PARENT::TypeConst() );
+const Type bhkSphereShape::TYPE("bhkSphereShape", &BHK_SPHERE_SHAPE_PARENT::TYPE );
 
 bhkSphereShape::bhkSphereShape() BHK_SPHERE_SHAPE_CONSTRUCT {}
 
@@ -42,7 +42,3 @@ float bhkSphereShape::GetRadius() const {
 void bhkSphereShape::SetRadius( float value ) {
 	radius = value;
 }
-
-const Type & bhkSphereShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkStiffSpringConstraint.cpp b/src/obj/bhkStiffSpringConstraint.cpp
index 8dbe1330e1527888fe5fda5ee44fa75b25ae2ca0..2ab45ddbe375dde3501a1846ce75595335a7b844 100644
--- a/src/obj/bhkStiffSpringConstraint.cpp
+++ b/src/obj/bhkStiffSpringConstraint.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkStiffSpringConstraint::TYPE("bhkStiffSpringConstraint", &BHK_STIFF_SPRING_CONSTRAINT_PARENT::TypeConst() );
+const Type bhkStiffSpringConstraint::TYPE("bhkStiffSpringConstraint", &BHK_STIFF_SPRING_CONSTRAINT_PARENT::TYPE );
 
 bhkStiffSpringConstraint::bhkStiffSpringConstraint() BHK_STIFF_SPRING_CONSTRAINT_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkStiffSpringConstraint::GetRefs() const {
 const Type & bhkStiffSpringConstraint::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkStiffSpringConstraint::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkTransformShape.cpp b/src/obj/bhkTransformShape.cpp
index 324dc4fadc5435774e75c557f773f686a102f861..f9e768a7d42b3ffc36a6c33667fd69a2f12711b4 100644
--- a/src/obj/bhkTransformShape.cpp
+++ b/src/obj/bhkTransformShape.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkTransformShape::TYPE("bhkTransformShape", &BHK_TRANSFORM_SHAPE_PARENT::TypeConst() );
+const Type bhkTransformShape::TYPE("bhkTransformShape", &BHK_TRANSFORM_SHAPE_PARENT::TYPE );
 
 bhkTransformShape::bhkTransformShape() BHK_TRANSFORM_SHAPE_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkTransformShape::GetRefs() const {
 const Type & bhkTransformShape::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkTransformShape::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/bhkWorldObject.cpp b/src/obj/bhkWorldObject.cpp
index 199a11783d5b97823ae96d189991efddec3c6f91..0bdd9c8215007f5df1104354cb24630bae52a7b3 100644
--- a/src/obj/bhkWorldObject.cpp
+++ b/src/obj/bhkWorldObject.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type bhkWorldObject::TYPE("bhkWorldObject", &BHK_WORLD_OBJECT_PARENT::TypeConst() );
+const Type bhkWorldObject::TYPE("bhkWorldObject", &BHK_WORLD_OBJECT_PARENT::TYPE );
 
 bhkWorldObject::bhkWorldObject() BHK_WORLD_OBJECT_CONSTRUCT {}
 
@@ -34,7 +34,3 @@ list<NiObjectRef> bhkWorldObject::GetRefs() const {
 const Type & bhkWorldObject::GetType() const {
 	return TYPE;
 };
-
-const Type & bhkWorldObject::TypeConst() {
-	return TYPE;
-}
diff --git a/src/obj/hkPackedNiTriStripsData.cpp b/src/obj/hkPackedNiTriStripsData.cpp
index f20ae0fb46b5e032858ca4636067885eb47d4c80..6f3dbb20da0eea60fc21931bb857ad2aaee43c67 100644
--- a/src/obj/hkPackedNiTriStripsData.cpp
+++ b/src/obj/hkPackedNiTriStripsData.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type hkPackedNiTriStripsData::TYPE("hkPackedNiTriStripsData", &HK_PACKED_NI_TRI_STRIPS_DATA_PARENT::TypeConst() );
+const Type hkPackedNiTriStripsData::TYPE("hkPackedNiTriStripsData", &HK_PACKED_NI_TRI_STRIPS_DATA_PARENT::TYPE );
 
 hkPackedNiTriStripsData::hkPackedNiTriStripsData() HK_PACKED_NI_TRI_STRIPS_DATA_CONSTRUCT {}
 
@@ -35,7 +35,3 @@ list<NiObjectRef> hkPackedNiTriStripsData::GetRefs() const {
 const Type & hkPackedNiTriStripsData::GetType() const {
 	return TYPE;
 };
-
-const Type & hkPackedNiTriStripsData::TypeConst() {
-	return TYPE;
-}