Index: src/AST/Pass.proto.hpp
===================================================================
--- src/AST/Pass.proto.hpp	(revision 22f94a4397386dcee79764eace3e5c71e0455838)
+++ src/AST/Pass.proto.hpp	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
@@ -248,10 +248,10 @@
 	template< typename pass_t >
 	static inline auto beginTrace(pass_t &, int) -> decltype( pass_t::traceId, void() ) {
-		Stats::Heap::stacktrace_push(pass_t::traceId);
+		// Stats::Heap::stacktrace_push(pass_t::traceId);
 	}
 
 	template< typename pass_t >
 	static inline auto endTrace(pass_t &, int) -> decltype( pass_t::traceId, void() ) {
-		Stats::Heap::stacktrace_pop();
+		// Stats::Heap::stacktrace_pop();
 	}
 
Index: src/AST/TypeSubstitution.cpp
===================================================================
--- src/AST/TypeSubstitution.cpp	(revision 22f94a4397386dcee79764eace3e5c71e0455838)
+++ src/AST/TypeSubstitution.cpp	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
@@ -20,5 +20,5 @@
 
 
-size_t TypeSubstitution::Substituter::traceId = Stats::Heap::new_stacktrace_id("TypeSubstitution");
+// size_t TypeSubstitution::Substituter::traceId = Stats::Heap::new_stacktrace_id("TypeSubstitution");
 
 TypeSubstitution::TypeSubstitution() {
Index: src/ResolvExpr/CandidateFinder.cpp
===================================================================
--- src/ResolvExpr/CandidateFinder.cpp	(revision 22f94a4397386dcee79764eace3e5c71e0455838)
+++ src/ResolvExpr/CandidateFinder.cpp	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
@@ -1508,5 +1508,5 @@
 	};
 
-	size_t Finder::traceId = Stats::Heap::new_stacktrace_id("Finder");
+	// size_t Finder::traceId = Stats::Heap::new_stacktrace_id("Finder");
 	/// Prunes a list of candidates down to those that have the minimum conversion cost for a given
 	/// return type. Skips ambiguous candidates.
Index: src/ResolvExpr/CommonType.cc
===================================================================
--- src/ResolvExpr/CommonType.cc	(revision 22f94a4397386dcee79764eace3e5c71e0455838)
+++ src/ResolvExpr/CommonType.cc	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
@@ -894,5 +894,5 @@
 	};
 
-	size_t CommonType_new::traceId = Stats::Heap::new_stacktrace_id("CommonType_new");
+	// size_t CommonType_new::traceId = Stats::Heap::new_stacktrace_id("CommonType_new");
 	namespace {
 		ast::ptr< ast::Type > handleReference(
Index: src/ResolvExpr/ConversionCost.cc
===================================================================
--- src/ResolvExpr/ConversionCost.cc	(revision 22f94a4397386dcee79764eace3e5c71e0455838)
+++ src/ResolvExpr/ConversionCost.cc	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
@@ -761,5 +761,5 @@
 	}
 }
-size_t ConversionCost_new::traceId = Stats::Heap::new_stacktrace_id("ConversionCost");
+// size_t ConversionCost_new::traceId = Stats::Heap::new_stacktrace_id("ConversionCost");
 
 } // namespace ResolvExpr
Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision 22f94a4397386dcee79764eace3e5c71e0455838)
+++ src/ResolvExpr/Resolver.cc	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
@@ -1267,5 +1267,5 @@
 		const ast::ConstructorInit * previsit( const ast::ConstructorInit * );
 	};
-	size_t Resolver_new::traceId = Stats::Heap::new_stacktrace_id("Resolver");
+	// size_t Resolver_new::traceId = Stats::Heap::new_stacktrace_id("Resolver");
 
 	void resolve( std::list< ast::ptr< ast::Decl > >& translationUnit ) {
Index: src/ResolvExpr/Unify.cc
===================================================================
--- src/ResolvExpr/Unify.cc	(revision 22f94a4397386dcee79764eace3e5c71e0455838)
+++ src/ResolvExpr/Unify.cc	(revision 0d070cacad00a72507dd2c167585d3eb6ccc9198)
@@ -1136,5 +1136,5 @@
 	};
 
-	size_t Unify_new::traceId = Stats::Heap::new_stacktrace_id("Unify_new");
+	// size_t Unify_new::traceId = Stats::Heap::new_stacktrace_id("Unify_new");
 	bool unify(
 			const ast::ptr<ast::Type> & type1, const ast::ptr<ast::Type> & type2,