Index: src/Common/PassVisitor.impl.h
===================================================================
--- src/Common/PassVisitor.impl.h	(revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc)
+++ src/Common/PassVisitor.impl.h	(revision ec8bcc4fe3cca97fdca9b5e7f7288e656978d613)
@@ -1087,10 +1087,12 @@
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( NullStmt * node ) {
-	VISIT_BODY( node );
+	VISIT_START( node );
+	VISIT_END( node );
 }
 
 template< typename pass_type >
 NullStmt * PassVisitor< pass_type >::mutate( NullStmt * node ) {
-	MUTATE_BODY( NullStmt, node );
+	MUTATE_START( node );
+	MUTATE_END( NullStmt, node );
 }
 
@@ -1099,10 +1101,18 @@
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( DeclStmt * node ) {
-	VISIT_BODY( node );
+	VISIT_START( node );
+
+	maybeAccept_impl( node->decl, *this );
+
+	VISIT_END( node );
 }
 
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( DeclStmt * node ) {
-	MUTATE_BODY( Statement, node );
+	MUTATE_START( node );
+
+	maybeMutate_impl( node->decl, *this );
+
+	MUTATE_END( Statement, node );
 }