Index: src/AST/Pass.hpp
===================================================================
--- src/AST/Pass.hpp	(revision 96c04e42a4fda498e09b123d4cb11501db114950)
+++ 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 96c04e42a4fda498e09b123d4cb11501db114950)
+++ 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 96c04e42a4fda498e09b123d4cb11501db114950)
+++ 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;