Index: src/AST/Pass.hpp
===================================================================
--- src/AST/Pass.hpp	(revision 91b9e107eb969e2dfc95e1fae9cd3907d68c0774)
+++ src/AST/Pass.hpp	(revision 822332e90fec6c4a9a05fd800863fb5009a81bcd)
@@ -352,5 +352,6 @@
 
 	template< typename core_t >
-	friend auto __pass::make_value_guard( core_t & core, int ) -> decltype( value_guard( core.at_cleanup ) );
+	friend auto __pass::make_value_guard( core_t & core, int )
+		-> decltype( __pass::value_guard( core.at_cleanup ) );
 public:
 
Index: src/AST/Pass.proto.hpp
===================================================================
--- src/AST/Pass.proto.hpp	(revision 91b9e107eb969e2dfc95e1fae9cd3907d68c0774)
+++ src/AST/Pass.proto.hpp	(revision 822332e90fec6c4a9a05fd800863fb5009a81bcd)
@@ -326,5 +326,5 @@
 template< typename core_t >
 static inline auto make_value_guard( core_t & core, int )
-		-> decltype( value_guard( core.at_cleanup ) ) {
+		-> decltype( __pass::value_guard( core.at_cleanup ) ) {
 	// Requires guaranteed copy elision:
 	return value_guard( core.at_cleanup );
Index: src/AST/Print.cpp
===================================================================
--- src/AST/Print.cpp	(revision 91b9e107eb969e2dfc95e1fae9cd3907d68c0774)
+++ src/AST/Print.cpp	(revision 822332e90fec6c4a9a05fd800863fb5009a81bcd)
@@ -103,6 +103,4 @@
 	}
 
-	static const char* Names[];
-
 	void print( const std::vector<ast::Label> & labels ) {
 		if ( labels.empty() ) return;
Index: src/ResolvExpr/CommonType.cpp
===================================================================
--- src/ResolvExpr/CommonType.cpp	(revision 91b9e107eb969e2dfc95e1fae9cd3907d68c0774)
+++ src/ResolvExpr/CommonType.cpp	(revision 822332e90fec6c4a9a05fd800863fb5009a81bcd)
@@ -353,5 +353,4 @@
 	ast::AssertionSet & have;
 public:
-	static size_t traceId;
 	ast::ptr< ast::Type > result;
 
Index: src/ResolvExpr/Unify.cpp
===================================================================
--- src/ResolvExpr/Unify.cpp	(revision 91b9e107eb969e2dfc95e1fae9cd3907d68c0774)
+++ src/ResolvExpr/Unify.cpp	(revision 822332e90fec6c4a9a05fd800863fb5009a81bcd)
@@ -274,6 +274,6 @@
 	void previsit( const ast::Node * ) { visit_children = false; }
 
-	void postvisit( const ast::VoidType * vt) {
-		result = dynamic_cast< const ast::VoidType * >( type2 ); 
+	void postvisit( const ast::VoidType * ) {
+		result = dynamic_cast< const ast::VoidType * >( type2 );
 			// || tryToUnifyWithEnumValue(vt, type2, tenv, need, have, open, noWiden());
 		;
@@ -610,15 +610,15 @@
 	}
 
-	void postvisit( const ast::VarArgsType * vat) {
+	void postvisit( const ast::VarArgsType * ) {
 		result = dynamic_cast< const ast::VarArgsType * >( type2 );
 			// || tryToUnifyWithEnumValue(vat, type2, tenv, need, have, open, noWiden());
 	}
 
-	void postvisit( const ast::ZeroType * zt) {
+	void postvisit( const ast::ZeroType * ) {
 		result = dynamic_cast< const ast::ZeroType * >( type2 );
 			// || tryToUnifyWithEnumValue(zt, type2, tenv, need, have, open, noWiden());
 	}
 
-	void postvisit( const ast::OneType * ot) {
+	void postvisit( const ast::OneType * ) {
 		result = dynamic_cast< const ast::OneType * >( type2 );
 			// || tryToUnifyWithEnumValue(ot, type2, tenv, need, have, open, noWiden());
Index: src/Tuples/Tuples.hpp
===================================================================
--- src/Tuples/Tuples.hpp	(revision 91b9e107eb969e2dfc95e1fae9cd3907d68c0774)
+++ src/Tuples/Tuples.hpp	(revision 822332e90fec6c4a9a05fd800863fb5009a81bcd)
@@ -22,5 +22,5 @@
 #include "AST/Node.hpp"
 namespace ResolvExpr {
-	class CandidateFinder;
+	struct CandidateFinder;
 }
 
Index: src/Validate/ImplementEnumFunc.cpp
===================================================================
--- src/Validate/ImplementEnumFunc.cpp	(revision 91b9e107eb969e2dfc95e1fae9cd3907d68c0774)
+++ src/Validate/ImplementEnumFunc.cpp	(revision 822332e90fec6c4a9a05fd800863fb5009a81bcd)
@@ -9,5 +9,4 @@
 class EnumAttrFuncGenerator {
 	const ast::EnumDecl* decl;
-	const ast::EnumInstType* instType;
 	unsigned int functionNesting;
 	ast::Linkage::Spec proto_linkage;
@@ -21,8 +20,7 @@
 	EnumAttrFuncGenerator(
 			const ast::EnumDecl* decl,
-			const ast::EnumInstType* instType,
+			const ast::EnumInstType*,
 			unsigned int functionNesting )
 		: decl(decl),
-		  instType{instType},
 		  functionNesting{functionNesting},
 		  proto_linkage{ast::Linkage::Cforall} {}
@@ -50,5 +48,5 @@
 	ast::FunctionDecl* genFromInstanceProto() const;
 	ast::FunctionDecl* genInstToInstFuncProto(const char* func) const;
-	void genFromIntBody(ast::FunctionDecl *) const; 
+	void genFromIntBody(ast::FunctionDecl *) const;
 	void genFromInstanceBody(ast::FunctionDecl *) const;
 	void genSuccPredBody(ast::FunctionDecl *, const char *) const;
@@ -388,5 +386,5 @@
 	if (decl->base) genTypedEnumFunction(ast::EnumAttribute::Value);
 	genTypedEnumFunction(ast::EnumAttribute::Label);
-	genTypedEnumFunction(ast::EnumAttribute::Posn);	
+	genTypedEnumFunction(ast::EnumAttribute::Posn);
 }