Index: src/Common/Assert.cc
===================================================================
--- src/Common/Assert.cc	(revision acd738aa4b3c107e0d22096954fcb98fa69acfe6)
+++ src/Common/Assert.cc	(revision b3c36f41fb2d199b6fa2a40962f5aafe79f7ceeb)
@@ -21,9 +21,9 @@
 extern const char * __progname;							// global name of running executable (argv[0])
 
-#define CFA_ASSERT_FMT "*CFA assertion error* from program \"%s\" in \"%s\" at line %d in file \"%s\""
+#define CFA_ASSERT_FMT "*CFA assertion error* \"%s\" from program \"%s\" in \"%s\" at line %d in file \"%s\""
 
 // called by macro assert in assert.h
 void __assert_fail( const char *assertion, const char *file, unsigned int line, const char *function ) {
-	fprintf( stderr, CFA_ASSERT_FMT ".\n", __progname, function, line, file );
+	fprintf( stderr, CFA_ASSERT_FMT ".\n", assertion, __progname, function, line, file );
 	abort();
 }
@@ -31,5 +31,5 @@
 // called by macro assertf
 void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) {
-	fprintf( stderr, CFA_ASSERT_FMT ": ", __progname, function, line, file );
+	fprintf( stderr, CFA_ASSERT_FMT ": ", assertion, __progname, function, line, file );
 	va_list args;
 	va_start( args, fmt );
Index: src/Common/PassVisitor.proto.h
===================================================================
--- src/Common/PassVisitor.proto.h	(revision acd738aa4b3c107e0d22096954fcb98fa69acfe6)
+++ src/Common/PassVisitor.proto.h	(revision b3c36f41fb2d199b6fa2a40962f5aafe79f7ceeb)
@@ -23,5 +23,5 @@
 
 template<typename pass_type, typename node_type>
-static inline void previsit_impl( __attribute__((unused)) pass_type& pass, node_type * node, __attribute__((unused)) long unused ) {}
+static inline void previsit_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) node_type * node, __attribute__((unused)) long unused ) {}
 
 
@@ -32,5 +32,5 @@
 
 template<typename pass_type, typename node_type>
-static inline void postvisit_impl( __attribute__((unused)) pass_type& pass, node_type * node, __attribute__((unused)) long unused ) {}
+static inline void postvisit_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) node_type * node, __attribute__((unused)) long unused ) {}
 
 // Mutate
@@ -41,5 +41,5 @@
 
 template<typename pass_type, typename node_type>
-static inline void premutate_impl( __attribute__((unused)) pass_type& pass, node_type * node, __attribute__((unused)) long unused ) {}
+static inline void premutate_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) node_type * node, __attribute__((unused)) long unused ) {}
 
 
@@ -71,9 +71,9 @@
 
 // Fields
-#define FIELD_PTR( type, name )                                                                                                                  \
-template<typename pass_type>                                                                                                                     \
-static inline auto name##_impl( pass_type& pass, __attribute__((unused)) int unused ) ->decltype( &pass.name ) { return &pass.name; }          \
-                                                                                                                                                 \
-template<typename pass_type>                                                                                                                     \
+#define FIELD_PTR( type, name )                                                                                                        \
+template<typename pass_type>                                                                                                           \
+static inline auto name##_impl( pass_type& pass, __attribute__((unused)) int unused ) ->decltype( &pass.name ) { return &pass.name; }  \
+                                                                                                                                       \
+template<typename pass_type>                                                                                                           \
 static inline type * name##_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) long unused ) { return nullptr;}    \