From def26469ff96228c66e877bb5594e7d9a24b638f Mon Sep 17 00:00:00 2001
From: Alexei Sheplyakov <varg@theor.jinr.ru>
Date: Fri, 17 Oct 2008 13:41:01 +0400
Subject: [PATCH] Wipe out remnants of custom RTTI.

Custom RTTI considered harmful, final part.
---
 doc/examples/mystring.cpp |  6 +++---
 ginac/add.cpp             |  6 ------
 ginac/basic.cpp           |  6 ++----
 ginac/basic.h             |  9 +--------
 ginac/clifford.cpp        |  5 -----
 ginac/clifford.h          |  4 ----
 ginac/color.cpp           |  5 -----
 ginac/constant.cpp        |  6 +++---
 ginac/container.h         | 41 +++++++++++++++++++--------------------
 ginac/expairseq.cpp       | 12 ++++++------
 ginac/exprseq.h           |  3 ---
 ginac/fderivative.cpp     |  4 ----
 ginac/function.pl         |  6 ------
 ginac/idx.cpp             |  8 ++------
 ginac/indexed.cpp         | 14 -------------
 ginac/integral.cpp        |  4 ++--
 ginac/lst.h               |  3 ---
 ginac/matrix.cpp          |  9 ++++-----
 ginac/mul.cpp             |  7 -------
 ginac/ncmul.cpp           |  8 --------
 ginac/numeric.cpp         | 18 ++++++++---------
 ginac/power.cpp           |  2 +-
 ginac/power.h             |  4 ++--
 ginac/pseries.cpp         |  4 ++--
 ginac/registrar.h         | 14 +++----------
 ginac/relational.cpp      |  5 +++--
 ginac/structure.h         |  5 ++---
 ginac/symbol.cpp          | 24 ++++++++++++++---------
 ginac/symmetry.cpp        |  6 +++---
 ginac/tensor.cpp          |  7 +------
 ginac/tensor.h            |  4 ----
 ginac/utils.h             |  2 +-
 ginac/wildcard.cpp        |  4 ++--
 33 files changed, 87 insertions(+), 178 deletions(-)

diff --git a/doc/examples/mystring.cpp b/doc/examples/mystring.cpp
index e9d12591..eb0e452c 100644
--- a/doc/examples/mystring.cpp
+++ b/doc/examples/mystring.cpp
@@ -29,9 +29,9 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(mystring, basic,
   print_func<print_context>(&mystring::do_print))
 
 // ctors
-mystring::mystring() : inherited(&mystring::tinfo_static) { }
-mystring::mystring(const string &s) : inherited(&mystring::tinfo_static), str(s) { }
-mystring::mystring(const char *s) : inherited(&mystring::tinfo_static), str(s) { }
+mystring::mystring() { }
+mystring::mystring(const string &s) :  str(s) { }
+mystring::mystring(const char *s) :  str(s) { }
 
 // comparison
 int mystring::compare_same_type(const basic &other) const
diff --git a/ginac/add.cpp b/ginac/add.cpp
index 547bee32..7f721544 100644
--- a/ginac/add.cpp
+++ b/ginac/add.cpp
@@ -49,7 +49,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(add, expairseq,
 
 add::add()
 {
-	tinfo_key = &add::tinfo_static;
 }
 
 //////////
@@ -60,7 +59,6 @@ add::add()
 
 add::add(const ex & lh, const ex & rh)
 {
-	tinfo_key = &add::tinfo_static;
 	overall_coeff = _ex0;
 	construct_from_2_ex(lh,rh);
 	GINAC_ASSERT(is_canonical());
@@ -68,7 +66,6 @@ add::add(const ex & lh, const ex & rh)
 
 add::add(const exvector & v)
 {
-	tinfo_key = &add::tinfo_static;
 	overall_coeff = _ex0;
 	construct_from_exvector(v);
 	GINAC_ASSERT(is_canonical());
@@ -76,7 +73,6 @@ add::add(const exvector & v)
 
 add::add(const epvector & v)
 {
-	tinfo_key = &add::tinfo_static;
 	overall_coeff = _ex0;
 	construct_from_epvector(v);
 	GINAC_ASSERT(is_canonical());
@@ -84,7 +80,6 @@ add::add(const epvector & v)
 
 add::add(const epvector & v, const ex & oc)
 {
-	tinfo_key = &add::tinfo_static;
 	overall_coeff = oc;
 	construct_from_epvector(v);
 	GINAC_ASSERT(is_canonical());
@@ -92,7 +87,6 @@ add::add(const epvector & v, const ex & oc)
 
 add::add(std::auto_ptr<epvector> vp, const ex & oc)
 {
-	tinfo_key = &add::tinfo_static;
 	GINAC_ASSERT(vp.get()!=0);
 	overall_coeff = oc;
 	construct_from_epvector(*vp);
diff --git a/ginac/basic.cpp b/ginac/basic.cpp
index 567760c9..237c63df 100644
--- a/ginac/basic.cpp
+++ b/ginac/basic.cpp
@@ -55,7 +55,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(basic, void,
 /** basic copy constructor: implicitly assumes that the other class is of
  *  the exact same type (as it's used by duplicate()), so it can copy the
  *  tinfo_key and the hash value. */
-basic::basic(const basic & other) : tinfo_key(other.tinfo_key), flags(other.flags & ~status_flags::dynallocated), hashvalue(other.hashvalue)
+basic::basic(const basic & other) : flags(other.flags & ~status_flags::dynallocated), hashvalue(other.hashvalue)
 {
 }
 
@@ -96,9 +96,7 @@ basic::basic(const archive_node &n, lst &sym_lst) : flags(0)
 {
 	// Reconstruct tinfo_key from class name
 	std::string class_name;
-	if (n.find_string("class", class_name))
-		tinfo_key = find_tinfo_key(class_name);
-	else
+	if (!n.find_string("class", class_name))
 		throw (std::runtime_error("archive node contains no class name"));
 }
 
diff --git a/ginac/basic.h b/ginac/basic.h
index 3685fb53..534a5915 100644
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -109,7 +109,7 @@ class basic : public refcounted
 	
 	// default constructor, destructor, copy constructor and assignment operator
 protected:
-	basic() : tinfo_key(&tinfo_static), flags(0) {}
+	basic() : flags(0) {}
 
 public:
 	/** basic destructor, virtual because class ex will delete objects of
@@ -122,10 +122,6 @@ public:
 	const basic & operator=(const basic & other);
 
 protected:
-	/** Constructor with specified tinfo_key (used by derived classes instead
-	 *  of the default constructor to avoid assigning tinfo_key twice). */
-	basic(tinfo_t ti) : tinfo_key(ti), flags(0) {}
-	
 	// new virtual functions which can be overridden by derived classes
 public: // only const functions please (may break reference counting)
 
@@ -266,8 +262,6 @@ public:
 		}
 	}
 
-	tinfo_t tinfo() const {return tinfo_key;}
-
 	/** Set some status_flags. */
 	const basic & setflag(unsigned f) const {flags |= f; return *this;}
 
@@ -283,7 +277,6 @@ protected:
 	
 	// member variables
 protected:
-	tinfo_t tinfo_key;                  ///< type info
 	mutable unsigned flags;             ///< of type status_flags
 	mutable unsigned hashvalue;         ///< hash value
 };
diff --git a/ginac/clifford.cpp b/ginac/clifford.cpp
index e6600372..d3667aac 100644
--- a/ginac/clifford.cpp
+++ b/ginac/clifford.cpp
@@ -76,7 +76,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(diracgammaR, tensor,
 
 clifford::clifford() : representation_label(0), metric(0), commutator_sign(-1)
 {
-	tinfo_key = &clifford::tinfo_static;
 }
 
 DEFAULT_CTOR(diracone)
@@ -95,7 +94,6 @@ DEFAULT_CTOR(diracgammaR)
  *  @see dirac_ONE */
 clifford::clifford(const ex & b, unsigned char rl) : inherited(b), representation_label(rl), metric(0), commutator_sign(-1)
 {
-	tinfo_key = &clifford::tinfo_static;
 }
 
 /** Construct object with one Lorentz index. This constructor is for internal
@@ -105,17 +103,14 @@ clifford::clifford(const ex & b, unsigned char rl) : inherited(b), representatio
 clifford::clifford(const ex & b, const ex & mu, const ex & metr, unsigned char rl, int comm_sign) : inherited(b, mu), representation_label(rl), metric(metr), commutator_sign(comm_sign)
 {
 	GINAC_ASSERT(is_a<varidx>(mu));
-	tinfo_key = &clifford::tinfo_static;
 }
 
 clifford::clifford(unsigned char rl, const ex & metr, int comm_sign, const exvector & v, bool discardable) : inherited(not_symmetric(), v, discardable), representation_label(rl), metric(metr), commutator_sign(comm_sign)
 {
-	tinfo_key = &clifford::tinfo_static;
 }
 
 clifford::clifford(unsigned char rl, const ex & metr, int comm_sign, std::auto_ptr<exvector> vp) : inherited(not_symmetric(), vp), representation_label(rl), metric(metr), commutator_sign(comm_sign)
 {
-	tinfo_key = &clifford::tinfo_static;
 }
 
 return_type_t clifford::return_type_tinfo() const
diff --git a/ginac/clifford.h b/ginac/clifford.h
index 59b49d0f..6b74a468 100644
--- a/ginac/clifford.h
+++ b/ginac/clifford.h
@@ -101,10 +101,6 @@ class cliffordunit : public tensor
 {
 	GINAC_DECLARE_REGISTERED_CLASS(cliffordunit, tensor)
 
-	// other constructors
-protected:
-	cliffordunit(tinfo_t ti) : inherited(ti) {}
-                                                                                                    
 	// functions overriding virtual functions from base classes
 public:
 	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const;
diff --git a/ginac/color.cpp b/ginac/color.cpp
index 43768633..30c38d9f 100644
--- a/ginac/color.cpp
+++ b/ginac/color.cpp
@@ -61,7 +61,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(su3d, tensor,
 
 color::color() : representation_label(0)
 {
-	tinfo_key = &color::tinfo_static;
 }
 
 DEFAULT_CTOR(su3one)
@@ -78,7 +77,6 @@ DEFAULT_CTOR(su3d)
  *  @see color_ONE */
 color::color(const ex & b, unsigned char rl) : inherited(b), representation_label(rl)
 {
-	tinfo_key = &color::tinfo_static;
 }
 
 /** Construct object with one color index. This constructor is for internal
@@ -86,17 +84,14 @@ color::color(const ex & b, unsigned char rl) : inherited(b), representation_labe
  *  @see color_T */
 color::color(const ex & b, const ex & i1, unsigned char rl) : inherited(b, i1), representation_label(rl)
 {
-	tinfo_key = &color::tinfo_static;
 }
 
 color::color(unsigned char rl, const exvector & v, bool discardable) : inherited(not_symmetric(), v, discardable), representation_label(rl)
 {
-	tinfo_key = &color::tinfo_static;
 }
 
 color::color(unsigned char rl, std::auto_ptr<exvector> vp) : inherited(not_symmetric(), vp), representation_label(rl)
 {
-	tinfo_key = &color::tinfo_static;
 }
 
 return_type_t color::return_type_tinfo() const
diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index b63427fc..9247ac20 100644
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -45,7 +45,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(constant, basic,
 
 // public
 
-constant::constant() : basic(&constant::tinfo_static), ef(0), serial(next_serial++), domain(domain::complex)
+constant::constant() : ef(0), serial(next_serial++), domain(domain::complex)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
@@ -57,7 +57,7 @@ constant::constant() : basic(&constant::tinfo_static), ef(0), serial(next_serial
 // public
 
 constant::constant(const std::string & initname, evalffunctype efun, const std::string & texname, unsigned dm)
-  : basic(&constant::tinfo_static), name(initname), ef(efun), serial(next_serial++), domain(dm)
+  : name(initname), ef(efun), serial(next_serial++), domain(dm)
 {
 	if (texname.empty())
 		TeX_name = "\\mbox{" + name + "}";
@@ -67,7 +67,7 @@ constant::constant(const std::string & initname, evalffunctype efun, const std::
 }
 
 constant::constant(const std::string & initname, const numeric & initnumber, const std::string & texname, unsigned dm)
-  : basic(&constant::tinfo_static), name(initname), ef(0), number(initnumber), serial(next_serial++), domain(dm)
+  : name(initname), ef(0), number(initnumber), serial(next_serial++), domain(dm)
 {
 	if (texname.empty())
 		TeX_name = "\\mbox{" + name + "}";
diff --git a/ginac/container.h b/ginac/container.h
index bd21eb91..7092e3b0 100644
--- a/ginac/container.h
+++ b/ginac/container.h
@@ -138,14 +138,13 @@ public:
 
 protected:
 	// helpers
-	static tinfo_t get_tinfo() { return NULL; }
 	static unsigned get_default_flags() { return 0; }
 	static char get_open_delim() { return '('; }
 	static char get_close_delim() { return ')'; }
 
 	// constructors
 public:
-	container(STLT const & s, bool discardable = false) : inherited(get_tinfo())
+	container(STLT const & s, bool discardable = false)
 	{
 		setflag(get_default_flags());
 
@@ -155,32 +154,32 @@ public:
 			this->seq = s;
 	}
 
-	explicit container(std::auto_ptr<STLT> vp) : inherited(get_tinfo())
+	explicit container(std::auto_ptr<STLT> vp)
 	{
 		setflag(get_default_flags());
 		this->seq.swap(*vp);
 	}
 
 	container(exvector::const_iterator b, exvector::const_iterator e)
-	 : inherited(get_tinfo()), container_storage<C>(b, e)
+	 : container_storage<C>(b, e)
 	{
 		setflag(get_default_flags());
 	}
 
 	explicit container(const ex & p1)
-	 : inherited(get_tinfo()), container_storage<C>(1, p1)
+	 : container_storage<C>(1, p1)
 	{
 		setflag(get_default_flags());
 	}
 
-	container(const ex & p1, const ex & p2) : inherited(get_tinfo())
+	container(const ex & p1, const ex & p2)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 2);
 		this->seq.push_back(p1); this->seq.push_back(p2);
 	}
 
-	container(const ex & p1, const ex & p2, const ex & p3) : inherited(get_tinfo())
+	container(const ex & p1, const ex & p2, const ex & p3)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 3);
@@ -188,7 +187,7 @@ public:
 	}
 
 	container(const ex & p1, const ex & p2, const ex & p3,
-	          const ex & p4) : inherited(get_tinfo())
+	          const ex & p4)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 4);
@@ -197,7 +196,7 @@ public:
 	}
 
 	container(const ex & p1, const ex & p2, const ex & p3,
-	          const ex & p4, const ex & p5) : inherited(get_tinfo())
+	          const ex & p4, const ex & p5)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 5);
@@ -206,7 +205,7 @@ public:
 	}
 
 	container(const ex & p1, const ex & p2, const ex & p3,
-	          const ex & p4, const ex & p5, const ex & p6) : inherited(get_tinfo())
+	          const ex & p4, const ex & p5, const ex & p6)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 6);
@@ -216,7 +215,7 @@ public:
 
 	container(const ex & p1, const ex & p2, const ex & p3,
 	          const ex & p4, const ex & p5, const ex & p6,
-	          const ex & p7) : inherited(get_tinfo())
+	          const ex & p7)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 7);
@@ -227,7 +226,7 @@ public:
 
 	container(const ex & p1, const ex & p2, const ex & p3,
 	          const ex & p4, const ex & p5, const ex & p6,
-	          const ex & p7, const ex & p8) : inherited(get_tinfo())
+	          const ex & p7, const ex & p8)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 8);
@@ -238,7 +237,7 @@ public:
 
 	container(const ex & p1, const ex & p2, const ex & p3,
 	          const ex & p4, const ex & p5, const ex & p6,
-	          const ex & p7, const ex & p8, const ex & p9) : inherited(get_tinfo())
+	          const ex & p7, const ex & p8, const ex & p9)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 9);
@@ -250,7 +249,7 @@ public:
 	container(const ex & p1, const ex & p2, const ex & p3,
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7, const ex & p8, const ex & p9,
-	          const ex & p10) : inherited(get_tinfo())
+	          const ex & p10)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 10);
@@ -263,7 +262,7 @@ public:
 	container(const ex & p1, const ex & p2, const ex & p3,
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7, const ex & p8, const ex & p9,
-	          const ex & p10, const ex & p11) : inherited(get_tinfo())
+	          const ex & p10, const ex & p11)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 11);
@@ -276,7 +275,7 @@ public:
 	container(const ex & p1, const ex & p2, const ex & p3,
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7, const ex & p8, const ex & p9,
-	          const ex & p10, const ex & p11, const ex & p12) : inherited(get_tinfo())
+	          const ex & p10, const ex & p11, const ex & p12)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 12);
@@ -290,7 +289,7 @@ public:
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7, const ex & p8, const ex & p9,
 	          const ex & p10, const ex & p11, const ex & p12,
-	          const ex & p13) : inherited(get_tinfo())
+	          const ex & p13)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 13);
@@ -305,7 +304,7 @@ public:
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7, const ex & p8, const ex & p9,
 	          const ex & p10, const ex & p11, const ex & p12,
-	          const ex & p13, const ex & p14) : inherited(get_tinfo())
+	          const ex & p13, const ex & p14)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 14);
@@ -320,7 +319,7 @@ public:
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7, const ex & p8, const ex & p9,
 	          const ex & p10, const ex & p11, const ex & p12,
-	          const ex & p13, const ex & p14, const ex & p15) : inherited(get_tinfo())
+	          const ex & p13, const ex & p14, const ex & p15)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 15);
@@ -336,7 +335,7 @@ public:
 	          const ex & p7, const ex & p8, const ex & p9,
 	          const ex & p10, const ex & p11, const ex & p12,
 	          const ex & p13, const ex & p14, const ex & p15,
-	          const ex & p16) : inherited(get_tinfo())
+	          const ex & p16)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 16);
@@ -476,7 +475,7 @@ protected:
 
 /** Default constructor */
 template <template <class T, class = std::allocator<T> > class C>
-container<C>::container() : inherited(get_tinfo())
+container<C>::container()
 {
 	setflag(get_default_flags());
 }
diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp
index 39f7931f..6057a85e 100644
--- a/ginac/expairseq.cpp
+++ b/ginac/expairseq.cpp
@@ -69,9 +69,9 @@ public:
 
 // public
 
-expairseq::expairseq() : inherited(&expairseq::tinfo_static)
+expairseq::expairseq() 
 #if EXPAIRSEQ_USE_HASHTAB
-                                                   , hashtabsize(0)
+	: hashtabsize(0)
 #endif // EXPAIRSEQ_USE_HASHTAB
 {}
 
@@ -108,20 +108,20 @@ void expairseq::copy(const expairseq &other)
 // other constructors
 //////////
 
-expairseq::expairseq(const ex &lh, const ex &rh) : inherited(&expairseq::tinfo_static)
+expairseq::expairseq(const ex &lh, const ex &rh)
 {
 	construct_from_2_ex(lh,rh);
 	GINAC_ASSERT(is_canonical());
 }
 
-expairseq::expairseq(const exvector &v) : inherited(&expairseq::tinfo_static)
+expairseq::expairseq(const exvector &v)
 {
 	construct_from_exvector(v);
 	GINAC_ASSERT(is_canonical());
 }
 
 expairseq::expairseq(const epvector &v, const ex &oc, bool do_index_renaming)
-  : inherited(&expairseq::tinfo_static), overall_coeff(oc)
+  :  overall_coeff(oc)
 {
 	GINAC_ASSERT(is_a<numeric>(oc));
 	construct_from_epvector(v, do_index_renaming);
@@ -129,7 +129,7 @@ expairseq::expairseq(const epvector &v, const ex &oc, bool do_index_renaming)
 }
 
 expairseq::expairseq(std::auto_ptr<epvector> vp, const ex &oc, bool do_index_renaming)
-  : inherited(&expairseq::tinfo_static), overall_coeff(oc)
+  :  overall_coeff(oc)
 {
 	GINAC_ASSERT(vp.get()!=0);
 	GINAC_ASSERT(is_a<numeric>(oc));
diff --git a/ginac/exprseq.h b/ginac/exprseq.h
index 8c008e65..ea26f858 100644
--- a/ginac/exprseq.h
+++ b/ginac/exprseq.h
@@ -31,9 +31,6 @@ namespace GiNaC {
 
 typedef container<std::vector> exprseq;
 
-/** Specialization of container::get_tinfo() for exprseq. */
-template<> inline tinfo_t exprseq::get_tinfo() { return &exprseq::tinfo_static; }
-
 // defined in exprseq.cpp
 template<> bool exprseq::info(unsigned inf) const;
 
diff --git a/ginac/fderivative.cpp b/ginac/fderivative.cpp
index 452e07e4..82a0c8d5 100644
--- a/ginac/fderivative.cpp
+++ b/ginac/fderivative.cpp
@@ -40,7 +40,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(fderivative, function,
 
 fderivative::fderivative()
 {
-	tinfo_key = &fderivative::tinfo_static;
 }
 
 //////////
@@ -50,17 +49,14 @@ fderivative::fderivative()
 fderivative::fderivative(unsigned ser, unsigned param, const exvector & args) : function(ser, args)
 {
 	parameter_set.insert(param);
-	tinfo_key = &fderivative::tinfo_static;
 }
 
 fderivative::fderivative(unsigned ser, const paramset & params, const exvector & args) : function(ser, args), parameter_set(params)
 {
-	tinfo_key = &fderivative::tinfo_static;
 }
 
 fderivative::fderivative(unsigned ser, const paramset & params, std::auto_ptr<exvector> vp) : function(ser, vp), parameter_set(params)
 {
-	tinfo_key = &fderivative::tinfo_static;
 }
 
 //////////
diff --git a/ginac/function.pl b/ginac/function.pl
index 88be68d8..6c70d2dd 100644
--- a/ginac/function.pl
+++ b/ginac/function.pl
@@ -138,7 +138,6 @@ $constructors_implementation=generate(
 function::function(unsigned ser, ${SEQ1})
 	: exprseq(${SEQ2}), serial(ser)
 {
-	tinfo_key = &function::tinfo_static;
 }
 END_OF_CONSTRUCTORS_IMPLEMENTATION
 
@@ -814,7 +813,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(function, exprseq)
 
 function::function() : serial(0)
 {
-	tinfo_key = &function::tinfo_static;
 }
 
 //////////
@@ -825,7 +823,6 @@ function::function() : serial(0)
 
 function::function(unsigned ser) : serial(ser)
 {
-	tinfo_key = &function::tinfo_static;
 }
 
 // the following lines have been generated for max. ${maxargs} parameters
@@ -834,7 +831,6 @@ $constructors_implementation
 
 function::function(unsigned ser, const exprseq & es) : exprseq(es), serial(ser)
 {
-	tinfo_key = &function::tinfo_static;
 
 	// Force re-evaluation even if the exprseq was already evaluated
 	// (the exprseq copy constructor copies the flags)
@@ -844,13 +840,11 @@ function::function(unsigned ser, const exprseq & es) : exprseq(es), serial(ser)
 function::function(unsigned ser, const exvector & v, bool discardable) 
   : exprseq(v,discardable), serial(ser)
 {
-	tinfo_key = &function::tinfo_static;
 }
 
 function::function(unsigned ser, std::auto_ptr<exvector> vp) 
   : exprseq(vp), serial(ser)
 {
-	tinfo_key = &function::tinfo_static;
 }
 
 //////////
diff --git a/ginac/idx.cpp b/ginac/idx.cpp
index 174f95f0..427dfe99 100644
--- a/ginac/idx.cpp
+++ b/ginac/idx.cpp
@@ -54,23 +54,21 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(spinidx, varidx,
 // default constructor
 //////////
 
-idx::idx() : inherited(&idx::tinfo_static) {}
+idx::idx() {}
 
 varidx::varidx() : covariant(false)
 {
-	tinfo_key = &varidx::tinfo_static;
 }
 
 spinidx::spinidx() : dotted(false)
 {
-	tinfo_key = &spinidx::tinfo_static;
 }
 
 //////////
 // other constructors
 //////////
 
-idx::idx(const ex & v, const ex & d) : inherited(&idx::tinfo_static), value(v), dim(d)
+idx::idx(const ex & v, const ex & d) :  value(v), dim(d)
 {
 	if (is_dim_numeric())
 		if (!dim.info(info_flags::posint))
@@ -79,12 +77,10 @@ idx::idx(const ex & v, const ex & d) : inherited(&idx::tinfo_static), value(v),
 
 varidx::varidx(const ex & v, const ex & d, bool cov) : inherited(v, d), covariant(cov)
 {
-	tinfo_key = &varidx::tinfo_static;
 }
 
 spinidx::spinidx(const ex & v, const ex & d, bool cov, bool dot) : inherited(v, d, cov), dotted(dot)
 {
-	tinfo_key = &spinidx::tinfo_static;
 }
 
 //////////
diff --git a/ginac/indexed.cpp b/ginac/indexed.cpp
index df89f129..8c5256af 100644
--- a/ginac/indexed.cpp
+++ b/ginac/indexed.cpp
@@ -55,7 +55,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(indexed, exprseq,
 
 indexed::indexed() : symtree(not_symmetric())
 {
-	tinfo_key = &indexed::tinfo_static;
 }
 
 //////////
@@ -64,79 +63,66 @@ indexed::indexed() : symtree(not_symmetric())
 
 indexed::indexed(const ex & b) : inherited(b), symtree(not_symmetric())
 {
-	tinfo_key = &indexed::tinfo_static;
 	validate();
 }
 
 indexed::indexed(const ex & b, const ex & i1) : inherited(b, i1), symtree(not_symmetric())
 {
-	tinfo_key = &indexed::tinfo_static;
 	validate();
 }
 
 indexed::indexed(const ex & b, const ex & i1, const ex & i2) : inherited(b, i1, i2), symtree(not_symmetric())
 {
-	tinfo_key = &indexed::tinfo_static;
 	validate();
 }
 
 indexed::indexed(const ex & b, const ex & i1, const ex & i2, const ex & i3) : inherited(b, i1, i2, i3), symtree(not_symmetric())
 {
-	tinfo_key = &indexed::tinfo_static;
 	validate();
 }
 
 indexed::indexed(const ex & b, const ex & i1, const ex & i2, const ex & i3, const ex & i4) : inherited(b, i1, i2, i3, i4), symtree(not_symmetric())
 {
-	tinfo_key = &indexed::tinfo_static;
 	validate();
 }
 
 indexed::indexed(const ex & b, const symmetry & symm, const ex & i1, const ex & i2) : inherited(b, i1, i2), symtree(symm)
 {
-	tinfo_key = &indexed::tinfo_static;
 	validate();
 }
 
 indexed::indexed(const ex & b, const symmetry & symm, const ex & i1, const ex & i2, const ex & i3) : inherited(b, i1, i2, i3), symtree(symm)
 {
-	tinfo_key = &indexed::tinfo_static;
 	validate();
 }
 
 indexed::indexed(const ex & b, const symmetry & symm, const ex & i1, const ex & i2, const ex & i3, const ex & i4) : inherited(b, i1, i2, i3, i4), symtree(symm)
 {
-	tinfo_key = &indexed::tinfo_static;
 	validate();
 }
 
 indexed::indexed(const ex & b, const exvector & v) : inherited(b), symtree(not_symmetric())
 {
 	seq.insert(seq.end(), v.begin(), v.end());
-	tinfo_key = &indexed::tinfo_static;
 	validate();
 }
 
 indexed::indexed(const ex & b, const symmetry & symm, const exvector & v) : inherited(b), symtree(symm)
 {
 	seq.insert(seq.end(), v.begin(), v.end());
-	tinfo_key = &indexed::tinfo_static;
 	validate();
 }
 
 indexed::indexed(const symmetry & symm, const exprseq & es) : inherited(es), symtree(symm)
 {
-	tinfo_key = &indexed::tinfo_static;
 }
 
 indexed::indexed(const symmetry & symm, const exvector & v, bool discardable) : inherited(v, discardable), symtree(symm)
 {
-	tinfo_key = &indexed::tinfo_static;
 }
 
 indexed::indexed(const symmetry & symm, std::auto_ptr<exvector> vp) : inherited(vp), symtree(symm)
 {
-	tinfo_key = &indexed::tinfo_static;
 }
 
 //////////
diff --git a/ginac/integral.cpp b/ginac/integral.cpp
index 22004756..74a356da 100644
--- a/ginac/integral.cpp
+++ b/ginac/integral.cpp
@@ -48,7 +48,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(integral, basic,
 //////////
 
 integral::integral()
-		: inherited(&integral::tinfo_static),
+		: 
 		x((new symbol())->setflag(status_flags::dynallocated))
 {}
 
@@ -59,7 +59,7 @@ integral::integral()
 // public
 
 integral::integral(const ex & x_, const ex & a_, const ex & b_, const ex & f_)
-		: inherited(&integral::tinfo_static), x(x_), a(a_), b(b_), f(f_)
+		:  x(x_), a(a_), b(b_), f(f_)
 {
 	if (!is_a<symbol>(x)) {
 		throw(std::invalid_argument("first argument of integral must be of type symbol"));
diff --git a/ginac/lst.h b/ginac/lst.h
index 332579f5..eaea3eaa 100644
--- a/ginac/lst.h
+++ b/ginac/lst.h
@@ -31,9 +31,6 @@ namespace GiNaC {
 
 typedef container<std::list> lst;
 
-/** Specialization of container::get_tinfo() for lst. */
-template<> inline tinfo_t lst::get_tinfo() { return &lst::tinfo_static; }
-
 /** Specialization of container::get_default_flags() for lst. */
 template<> inline unsigned lst::get_default_flags() { return status_flags::not_shareable; }
 
diff --git a/ginac/matrix.cpp b/ginac/matrix.cpp
index d108bd4c..c92ea3f5 100644
--- a/ginac/matrix.cpp
+++ b/ginac/matrix.cpp
@@ -53,7 +53,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(matrix, basic,
 //////////
 
 /** Default ctor.  Initializes to 1 x 1-dimensional zero-matrix. */
-matrix::matrix() : inherited(&matrix::tinfo_static), row(1), col(1), m(1, _ex0)
+matrix::matrix() : row(1), col(1), m(1, _ex0)
 {
 	setflag(status_flags::not_shareable);
 }
@@ -68,8 +68,7 @@ matrix::matrix() : inherited(&matrix::tinfo_static), row(1), col(1), m(1, _ex0)
  *
  *  @param r number of rows
  *  @param c number of cols */
-matrix::matrix(unsigned r, unsigned c)
-  : inherited(&matrix::tinfo_static), row(r), col(c), m(r*c, _ex0)
+matrix::matrix(unsigned r, unsigned c) : row(r), col(c), m(r*c, _ex0)
 {
 	setflag(status_flags::not_shareable);
 }
@@ -78,7 +77,7 @@ matrix::matrix(unsigned r, unsigned c)
 
 /** Ctor from representation, for internal use only. */
 matrix::matrix(unsigned r, unsigned c, const exvector & m2)
-  : inherited(&matrix::tinfo_static), row(r), col(c), m(m2)
+  : row(r), col(c), m(m2)
 {
 	setflag(status_flags::not_shareable);
 }
@@ -88,7 +87,7 @@ matrix::matrix(unsigned r, unsigned c, const exvector & m2)
  *  If the list has more elements than the matrix, the excessive elements are
  *  thrown away. */
 matrix::matrix(unsigned r, unsigned c, const lst & l)
-  : inherited(&matrix::tinfo_static), row(r), col(c), m(r*c, _ex0)
+  : row(r), col(c), m(r*c, _ex0)
 {
 	setflag(status_flags::not_shareable);
 
diff --git a/ginac/mul.cpp b/ginac/mul.cpp
index 96b965d1..ad311398 100644
--- a/ginac/mul.cpp
+++ b/ginac/mul.cpp
@@ -53,7 +53,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(mul, expairseq,
 
 mul::mul()
 {
-	tinfo_key = &mul::tinfo_static;
 }
 
 //////////
@@ -64,7 +63,6 @@ mul::mul()
 
 mul::mul(const ex & lh, const ex & rh)
 {
-	tinfo_key = &mul::tinfo_static;
 	overall_coeff = _ex1;
 	construct_from_2_ex(lh,rh);
 	GINAC_ASSERT(is_canonical());
@@ -72,7 +70,6 @@ mul::mul(const ex & lh, const ex & rh)
 
 mul::mul(const exvector & v)
 {
-	tinfo_key = &mul::tinfo_static;
 	overall_coeff = _ex1;
 	construct_from_exvector(v);
 	GINAC_ASSERT(is_canonical());
@@ -80,7 +77,6 @@ mul::mul(const exvector & v)
 
 mul::mul(const epvector & v)
 {
-	tinfo_key = &mul::tinfo_static;
 	overall_coeff = _ex1;
 	construct_from_epvector(v);
 	GINAC_ASSERT(is_canonical());
@@ -88,7 +84,6 @@ mul::mul(const epvector & v)
 
 mul::mul(const epvector & v, const ex & oc, bool do_index_renaming)
 {
-	tinfo_key = &mul::tinfo_static;
 	overall_coeff = oc;
 	construct_from_epvector(v, do_index_renaming);
 	GINAC_ASSERT(is_canonical());
@@ -96,7 +91,6 @@ mul::mul(const epvector & v, const ex & oc, bool do_index_renaming)
 
 mul::mul(std::auto_ptr<epvector> vp, const ex & oc, bool do_index_renaming)
 {
-	tinfo_key = &mul::tinfo_static;
 	GINAC_ASSERT(vp.get()!=0);
 	overall_coeff = oc;
 	construct_from_epvector(*vp, do_index_renaming);
@@ -105,7 +99,6 @@ mul::mul(std::auto_ptr<epvector> vp, const ex & oc, bool do_index_renaming)
 
 mul::mul(const ex & lh, const ex & mh, const ex & rh)
 {
-	tinfo_key = &mul::tinfo_static;
 	exvector factors;
 	factors.reserve(3);
 	factors.push_back(lh);
diff --git a/ginac/ncmul.cpp b/ginac/ncmul.cpp
index e0bc7dee..2c0d7365 100644
--- a/ginac/ncmul.cpp
+++ b/ginac/ncmul.cpp
@@ -49,7 +49,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(ncmul, exprseq,
 
 ncmul::ncmul()
 {
-	tinfo_key = &ncmul::tinfo_static;
 }
 
 //////////
@@ -60,40 +59,33 @@ ncmul::ncmul()
 
 ncmul::ncmul(const ex & lh, const ex & rh) : inherited(lh,rh)
 {
-	tinfo_key = &ncmul::tinfo_static;
 }
 
 ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3) : inherited(f1,f2,f3)
 {
-	tinfo_key = &ncmul::tinfo_static;
 }
 
 ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3,
              const ex & f4) : inherited(f1,f2,f3,f4)
 {
-	tinfo_key = &ncmul::tinfo_static;
 }
 
 ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3,
              const ex & f4, const ex & f5) : inherited(f1,f2,f3,f4,f5)
 {
-	tinfo_key = &ncmul::tinfo_static;
 }
 
 ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3,
              const ex & f4, const ex & f5, const ex & f6) : inherited(f1,f2,f3,f4,f5,f6)
 {
-	tinfo_key = &ncmul::tinfo_static;
 }
 
 ncmul::ncmul(const exvector & v, bool discardable) : inherited(v,discardable)
 {
-	tinfo_key = &ncmul::tinfo_static;
 }
 
 ncmul::ncmul(std::auto_ptr<exvector> vp) : inherited(vp)
 {
-	tinfo_key = &ncmul::tinfo_static;
 }
 
 //////////
diff --git a/ginac/numeric.cpp b/ginac/numeric.cpp
index 49951470..5649353f 100644
--- a/ginac/numeric.cpp
+++ b/ginac/numeric.cpp
@@ -73,7 +73,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(numeric, basic,
 //////////
 
 /** default ctor. Numerically it initializes to an integer zero. */
-numeric::numeric() : basic(&numeric::tinfo_static)
+numeric::numeric()
 {
 	value = cln::cl_I(0);
 	setflag(status_flags::evaluated | status_flags::expanded);
@@ -85,7 +85,7 @@ numeric::numeric() : basic(&numeric::tinfo_static)
 
 // public
 
-numeric::numeric(int i) : basic(&numeric::tinfo_static)
+numeric::numeric(int i)
 {
 	// Not the whole int-range is available if we don't cast to long
 	// first.  This is due to the behaviour of the cl_I-ctor, which
@@ -106,7 +106,7 @@ numeric::numeric(int i) : basic(&numeric::tinfo_static)
 }
 
 
-numeric::numeric(unsigned int i) : basic(&numeric::tinfo_static)
+numeric::numeric(unsigned int i)
 {
 	// Not the whole uint-range is available if we don't cast to ulong
 	// first.  This is due to the behaviour of the cl_I-ctor, which
@@ -127,14 +127,14 @@ numeric::numeric(unsigned int i) : basic(&numeric::tinfo_static)
 }
 
 
-numeric::numeric(long i) : basic(&numeric::tinfo_static)
+numeric::numeric(long i)
 {
 	value = cln::cl_I(i);
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 
-numeric::numeric(unsigned long i) : basic(&numeric::tinfo_static)
+numeric::numeric(unsigned long i)
 {
 	value = cln::cl_I(i);
 	setflag(status_flags::evaluated | status_flags::expanded);
@@ -144,7 +144,7 @@ numeric::numeric(unsigned long i) : basic(&numeric::tinfo_static)
 /** Constructor for rational numerics a/b.
  *
  *  @exception overflow_error (division by zero) */
-numeric::numeric(long numer, long denom) : basic(&numeric::tinfo_static)
+numeric::numeric(long numer, long denom)
 {
 	if (!denom)
 		throw std::overflow_error("division by zero");
@@ -153,7 +153,7 @@ numeric::numeric(long numer, long denom) : basic(&numeric::tinfo_static)
 }
 
 
-numeric::numeric(double d) : basic(&numeric::tinfo_static)
+numeric::numeric(double d)
 {
 	// We really want to explicitly use the type cl_LF instead of the
 	// more general cl_F, since that would give us a cl_DF only which
@@ -165,7 +165,7 @@ numeric::numeric(double d) : basic(&numeric::tinfo_static)
 
 /** ctor from C-style string.  It also accepts complex numbers in GiNaC
  *  notation like "2+5*I". */
-numeric::numeric(const char *s) : basic(&numeric::tinfo_static)
+numeric::numeric(const char *s)
 {
 	cln::cl_N ctorval = 0;
 	// parse complex numbers (functional but not completely safe, unfortunately
@@ -244,7 +244,7 @@ numeric::numeric(const char *s) : basic(&numeric::tinfo_static)
 
 /** Ctor from CLN types.  This is for the initiated user or internal use
  *  only. */
-numeric::numeric(const cln::cl_N &z) : basic(&numeric::tinfo_static)
+numeric::numeric(const cln::cl_N &z)
 {
 	value = z;
 	setflag(status_flags::evaluated | status_flags::expanded);
diff --git a/ginac/power.cpp b/ginac/power.cpp
index ca7fea54..ca9600f8 100644
--- a/ginac/power.cpp
+++ b/ginac/power.cpp
@@ -59,7 +59,7 @@ typedef std::vector<int> intvector;
 // default constructor
 //////////
 
-power::power() : inherited(&power::tinfo_static) { }
+power::power() { }
 
 //////////
 // other constructors
diff --git a/ginac/power.h b/ginac/power.h
index a13f7fcf..f8d29c0f 100644
--- a/ginac/power.h
+++ b/ginac/power.h
@@ -44,8 +44,8 @@ class power : public basic
 	
 	// other constructors
 public:
-	power(const ex & lh, const ex & rh) : inherited(&power::tinfo_static), basis(lh), exponent(rh) {}
-	template<typename T> power(const ex & lh, const T & rh) : inherited(&power::tinfo_static), basis(lh), exponent(rh) {}
+	power(const ex & lh, const ex & rh) :  basis(lh), exponent(rh) {}
+	template<typename T> power(const ex & lh, const T & rh) :  basis(lh), exponent(rh) {}
 	
 	// functions overriding virtual functions from base classes
 public:
diff --git a/ginac/pseries.cpp b/ginac/pseries.cpp
index 3188dd22..989fda84 100644
--- a/ginac/pseries.cpp
+++ b/ginac/pseries.cpp
@@ -52,7 +52,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(pseries, basic,
  *  Default constructor
  */
 
-pseries::pseries() : inherited(&pseries::tinfo_static) { }
+pseries::pseries() { }
 
 
 /*
@@ -68,7 +68,7 @@ pseries::pseries() : inherited(&pseries::tinfo_static) { }
  *  @param rel_  expansion variable and point (must hold a relational)
  *  @param ops_  vector of {coefficient, power} pairs (coefficient must not be zero)
  *  @return newly constructed pseries */
-pseries::pseries(const ex &rel_, const epvector &ops_) : basic(&pseries::tinfo_static), seq(ops_)
+pseries::pseries(const ex &rel_, const epvector &ops_) : seq(ops_)
 {
 	GINAC_ASSERT(is_a<relational>(rel_));
 	GINAC_ASSERT(is_a<symbol>(rel_.lhs()));
diff --git a/ginac/registrar.h b/ginac/registrar.h
index f7790d9e..2bf97a5a 100644
--- a/ginac/registrar.h
+++ b/ginac/registrar.h
@@ -76,10 +76,6 @@ template<typename T> inline return_type_t make_return_type_t(const unsigned rl =
 	return ret;
 }
 
-/** Definitions for the tinfo mechanism. */
-typedef const void * tinfo_t;
-struct tinfo_static_t {};
-
 /** Unarchiving function (static member function of every GiNaC class). */
 typedef ex (*unarch_func)(const archive_node &n, lst &sym_lst);
 
@@ -141,7 +137,6 @@ typedef class_info<registered_class_options> registered_class_info;
 #define GINAC_DECLARE_REGISTERED_CLASS_NO_CTORS(classname, supername) \
 public: \
 	typedef supername inherited; \
-    static const GiNaC::tinfo_static_t tinfo_static; \
 private: \
 	static GiNaC::registered_class_info reg_info; \
 public: \
@@ -184,20 +179,17 @@ private:
 
 /** Macro for inclusion in the implementation of each registered class. */
 #define GINAC_IMPLEMENT_REGISTERED_CLASS(classname, supername) \
-	GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, typeid(classname), &classname::unarchive)); \
-	const GiNaC::tinfo_static_t classname::tinfo_static = {};
+	GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, typeid(classname), &classname::unarchive)); 
 
 /** Macro for inclusion in the implementation of each registered class.
  *  Additional options can be specified. */
 #define GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(classname, supername, options) \
-	GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, typeid(classname), &classname::unarchive).options); \
-	const GiNaC::tinfo_static_t classname::tinfo_static = {};
+	GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, typeid(classname), &classname::unarchive).options);
 
 /** Macro for inclusion in the implementation of each registered class.
  *  Additional options can be specified. */
 #define GINAC_IMPLEMENT_REGISTERED_CLASS_OPT_T(classname, supername, options) \
-	GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, typeid(classname), &classname::unarchive).options); \
-	template<> const GiNaC::tinfo_static_t classname::tinfo_static = {};
+	GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, typeid(classname), &classname::unarchive).options);
 
 
 /** Find type information key by class name. */
diff --git a/ginac/relational.cpp b/ginac/relational.cpp
index f3329f98..b59f7ab3 100644
--- a/ginac/relational.cpp
+++ b/ginac/relational.cpp
@@ -40,7 +40,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(relational, basic,
 // default constructor
 //////////
 
-relational::relational() : basic(&relational::tinfo_static) {}
+relational::relational() { }
 
 //////////
 // other constructors
@@ -48,7 +48,8 @@ relational::relational() : basic(&relational::tinfo_static) {}
 
 // public
 
-relational::relational(const ex & lhs, const ex & rhs, operators oper) : basic(&relational::tinfo_static), lh(lhs), rh(rhs), o(oper) {}
+relational::relational(const ex & lhs, const ex & rhs, operators oper) :
+	lh(lhs), rh(rhs), o(oper) { }
 
 //////////
 // archiving
diff --git a/ginac/structure.h b/ginac/structure.h
index 6c08618c..3987d806 100644
--- a/ginac/structure.h
+++ b/ginac/structure.h
@@ -117,13 +117,12 @@ class structure : public basic, public ComparisonPolicy<T> {
 	GINAC_DECLARE_REGISTERED_CLASS(structure, basic)
 
 	// helpers
-	static tinfo_t get_tinfo() { return reg_info.options.get_id(); }
 	static const char *get_class_name() { return "structure"; }
 
 	// constructors
 public:
 	/** Construct structure as a copy of a given C++ structure. */
-	structure(const T & t) : inherited(get_tinfo()), obj(t) { }
+	structure(const T & t) : obj(t) { }
 
 	// functions overriding virtual functions from base classes
 	// All these are just defaults that can be specialized by the user
@@ -231,7 +230,7 @@ private:
 
 /** Default constructor */
 template <class T, template <class> class CP>
-structure<T, CP>::structure() : inherited(get_tinfo()) { }
+structure<T, CP>::structure() { }
 
 /** Construct object from archive_node. */
 template <class T, template <class> class CP>
diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp
index 0bdebc0e..6ef9ade5 100644
--- a/ginac/symbol.cpp
+++ b/ginac/symbol.cpp
@@ -45,7 +45,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(symbol, basic,
 // symbol
 
 symbol::symbol()
- : inherited(&symbol::tinfo_static), serial(next_serial++), name(autoname_prefix() + ToString(serial)), TeX_name(name), domain(domain::complex), ret_type(return_types::commutative), ret_type_tinfo(make_return_type_t<symbol>())
+ :  serial(next_serial++), name(autoname_prefix() + ToString(serial)), TeX_name(name), domain(domain::complex), ret_type(return_types::commutative), ret_type_tinfo(make_return_type_t<symbol>())
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
@@ -72,26 +72,32 @@ possymbol::possymbol()
 
 // symbol
 
-symbol::symbol(const std::string & initname, unsigned domain)
- : inherited(&symbol::tinfo_static), serial(next_serial++), name(initname), TeX_name(default_TeX_name()), domain(domain), ret_type(return_types::commutative), ret_type_tinfo(make_return_type_t<symbol>())
+symbol::symbol(const std::string & initname, unsigned domain) :
+	serial(next_serial++), name(initname), TeX_name(default_TeX_name()),
+	domain(domain), ret_type(return_types::commutative),
+	ret_type_tinfo(make_return_type_t<symbol>())
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-symbol::symbol(const std::string & initname, unsigned rt, const return_type_t& rtt, unsigned domain)
- : inherited(&symbol::tinfo_static), serial(next_serial++), name(initname), TeX_name(default_TeX_name()), domain(domain), ret_type(rt), ret_type_tinfo(rtt)
+symbol::symbol(const std::string & initname, unsigned rt, const return_type_t& rtt, unsigned domain) :
+	serial(next_serial++), name(initname), TeX_name(default_TeX_name()),
+	domain(domain), ret_type(rt), ret_type_tinfo(rtt)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-symbol::symbol(const std::string & initname, const std::string & texname, unsigned domain)
- : inherited(&symbol::tinfo_static), serial(next_serial++), name(initname), TeX_name(texname), domain(domain), ret_type(return_types::commutative), ret_type_tinfo(make_return_type_t<symbol>())
+symbol::symbol(const std::string & initname, const std::string & texname, unsigned domain) :
+	serial(next_serial++), name(initname), TeX_name(texname), domain(domain),
+	ret_type(return_types::commutative), ret_type_tinfo(make_return_type_t<symbol>())
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-symbol::symbol(const std::string & initname, const std::string & texname, unsigned rt, const return_type_t& rtt, unsigned domain)
- : inherited(&symbol::tinfo_static),  serial(next_serial++), name(initname), TeX_name(texname), domain(domain), ret_type(rt), ret_type_tinfo(rtt)
+symbol::symbol(const std::string & initname, const std::string & texname,
+	       unsigned rt, const return_type_t& rtt, unsigned domain) : 
+	serial(next_serial++), name(initname), TeX_name(texname),
+	domain(domain), ret_type(rt), ret_type_tinfo(rtt)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
diff --git a/ginac/symmetry.cpp b/ginac/symmetry.cpp
index 9a158926..dd3029e5 100644
--- a/ginac/symmetry.cpp
+++ b/ginac/symmetry.cpp
@@ -56,7 +56,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(symmetry, basic,
 // default constructor
 //////////
 
-symmetry::symmetry() : inherited(&symmetry::tinfo_static), type(none)
+symmetry::symmetry() :  type(none)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
@@ -65,13 +65,13 @@ symmetry::symmetry() : inherited(&symmetry::tinfo_static), type(none)
 // other constructors
 //////////
 
-symmetry::symmetry(unsigned i) : inherited(&symmetry::tinfo_static), type(none)
+symmetry::symmetry(unsigned i) :  type(none)
 {
 	indices.insert(i);
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-symmetry::symmetry(symmetry_type t, const symmetry &c1, const symmetry &c2) : inherited(&symmetry::tinfo_static), type(t)
+symmetry::symmetry(symmetry_type t, const symmetry &c1, const symmetry &c2) :  type(t)
 {
 	add(c1); add(c2);
 	setflag(status_flags::evaluated | status_flags::expanded);
diff --git a/ginac/tensor.cpp b/ginac/tensor.cpp
index 462ba2c7..22b3e730 100644
--- a/ginac/tensor.cpp
+++ b/ginac/tensor.cpp
@@ -64,7 +64,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(tensepsilon, tensor,
 // constructors
 //////////
 
-tensor::tensor() : inherited(&tensor::tinfo_static)
+tensor::tensor()
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
@@ -74,27 +74,22 @@ DEFAULT_CTOR(tensmetric)
 
 minkmetric::minkmetric() : pos_sig(false)
 {
-	tinfo_key = &minkmetric::tinfo_static;
 }
 
 spinmetric::spinmetric()
 {
-	tinfo_key = &spinmetric::tinfo_static;
 }
 
 minkmetric::minkmetric(bool ps) : pos_sig(ps)
 {
-	tinfo_key = &minkmetric::tinfo_static;
 }
 
 tensepsilon::tensepsilon() : minkowski(false), pos_sig(false)
 {
-	tinfo_key = &tensepsilon::tinfo_static;
 }
 
 tensepsilon::tensepsilon(bool mink, bool ps) : minkowski(mink), pos_sig(ps)
 {
-	tinfo_key = &tensepsilon::tinfo_static;
 }
 
 //////////
diff --git a/ginac/tensor.h b/ginac/tensor.h
index daf869e6..37deaa5b 100644
--- a/ginac/tensor.h
+++ b/ginac/tensor.h
@@ -35,10 +35,6 @@ class tensor : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(tensor, basic)
 
-	// other constructors
-protected:
-	tensor(tinfo_t ti) : inherited(ti) {}
-
 	// functions overriding virtual functions from base classes
 protected:
 	unsigned return_type() const { return return_types::noncommutative_composite; }
diff --git a/ginac/utils.h b/ginac/utils.h
index 3c293ea8..c5d7e03d 100644
--- a/ginac/utils.h
+++ b/ginac/utils.h
@@ -405,7 +405,7 @@ extern const ex _ex120;
 // Helper macros for class implementations (mostly useful for trivial classes)
 
 #define DEFAULT_CTOR(classname) \
-classname::classname() : inherited(&classname::tinfo_static) { setflag(status_flags::evaluated | status_flags::expanded); }
+classname::classname() { setflag(status_flags::evaluated | status_flags::expanded); }
 
 #define DEFAULT_UNARCHIVE(classname) \
 ex classname::unarchive(const archive_node &n, lst &sym_lst) \
diff --git a/ginac/wildcard.cpp b/ginac/wildcard.cpp
index 4a89957b..50eb67b7 100644
--- a/ginac/wildcard.cpp
+++ b/ginac/wildcard.cpp
@@ -37,7 +37,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(wildcard, basic,
 // default constructor
 //////////
 
-wildcard::wildcard() : inherited(&wildcard::tinfo_static), label(0)
+wildcard::wildcard() : label(0)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
@@ -46,7 +46,7 @@ wildcard::wildcard() : inherited(&wildcard::tinfo_static), label(0)
 // other constructors
 //////////
 
-wildcard::wildcard(unsigned l) : inherited(&wildcard::tinfo_static), label(l)
+wildcard::wildcard(unsigned l) : label(l)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
-- 
2.44.0