Index: src/Common/PassVisitor.impl.h
===================================================================
--- src/Common/PassVisitor.impl.h	(revision 292d599b65d54a5005b8bf8c6e8d95e4a5761fb8)
+++ src/Common/PassVisitor.impl.h	(revision 2a5e8a6c5f317ed7882dfbe7087543a0a5469976)
@@ -168,4 +168,5 @@
 template< typename Container, typename pass_type >
 inline void maybeMutate_impl( Container & container, PassVisitor< pass_type > & mutator ) {
+
 	if ( ! mutator.get_visit_children() ) return;
 	SemanticErrorException errors;
@@ -217,4 +218,5 @@
 		try {
 			func( *i );
+			assert( *i );
 			assert(( empty( beforeStmts ) && empty( afterStmts ))
 			    || ( empty( beforeDecls ) && empty( afterDecls )) );
Index: src/Common/PassVisitor.proto.h
===================================================================
--- src/Common/PassVisitor.proto.h	(revision 292d599b65d54a5005b8bf8c6e8d95e4a5761fb8)
+++ src/Common/PassVisitor.proto.h	(revision 2a5e8a6c5f317ed7882dfbe7087543a0a5469976)
@@ -222,4 +222,6 @@
 INDEXER_FUNC2( addWith   , std::list< Expression * > &, BaseSyntaxNode * );
 
+#undef INDEXER_FUNC1
+#undef INDEXER_FUNC2
 
 template<typename pass_type>