Index: src/GenPoly/InstantiateGenericNew.cpp
===================================================================
--- src/GenPoly/InstantiateGenericNew.cpp	(revision 0bd46fdf0880513efbef382cb2e926954f5c6001)
+++ src/GenPoly/InstantiateGenericNew.cpp	(revision 5f9c42bc7375583e7b9739ec0f5afd42ab94c1f0)
@@ -23,4 +23,5 @@
 #include "AST/Copy.hpp"                // for deepCopy
 #include "AST/Create.hpp"              // for asForward
+#include "AST/Inspect.hpp"             // for getFunction
 #include "AST/Pass.hpp"                // for Pass, WithGuard, WithShortCi...
 #include "AST/TranslationUnit.hpp"     // for TranslationUnit
@@ -30,5 +31,4 @@
 #include "GenPoly/GenPoly.h"           // for isPolyType, typesPolyCompatible
 #include "GenPoly/ScrubTyVars.h"       // for scrubAll
-#include "InitTweak/InitTweak.h"       // for getFunction
 #include "ResolvExpr/typeops.h"        // for typesCompatible
 
@@ -294,5 +294,5 @@
 		ast::ApplicationExpr const * expr ) {
 	GuardValue( isLValueArg ) = false;
-	ast::Decl const * function = InitTweak::getFunction( expr );
+	ast::Decl const * function = ast::getFunction( expr );
 	if ( ast::Linkage::Intrinsic != function->linkage
 			|| !CodeGen::isAssignment( function->name ) ) {
Index: src/GenPoly/SpecializeNew.cpp
===================================================================
--- src/GenPoly/SpecializeNew.cpp	(revision 0bd46fdf0880513efbef382cb2e926954f5c6001)
+++ src/GenPoly/SpecializeNew.cpp	(revision 5f9c42bc7375583e7b9739ec0f5afd42ab94c1f0)
@@ -16,13 +16,11 @@
 #include "Specialize.h"
 
-#include "AST/Pass.hpp"
+#include "AST/Inspect.hpp"               // for isIntrinsicCallExpr
+#include "AST/Pass.hpp"                  // for Pass
 #include "AST/TypeEnvironment.hpp"       // for OpenVarSet, AssertionSet
 #include "Common/UniqueName.h"           // for UniqueName
 #include "GenPoly/GenPoly.h"             // for getFunctionType
-#include "InitTweak/InitTweak.h"         // for isIntrinsicCallExpr
 #include "ResolvExpr/FindOpenVars.h"     // for findOpenVars
 #include "ResolvExpr/TypeEnvironment.h"  // for FirstOpen, FirstClosed
-
-#include "AST/Print.hpp"
 
 namespace GenPoly {
@@ -425,5 +423,5 @@
 const ast::Expr * SpecializeCore::postvisit(
 		const ast::ApplicationExpr * expr ) {
-	if ( InitTweak::isIntrinsicCallExpr( expr ) ) {
+	if ( ast::isIntrinsicCallExpr( expr ) ) {
 		return expr;
 	}