Index: src/Common/Heap.cc
===================================================================
--- src/Common/Heap.cc	(revision 01690b7043d295891fbc0a37b36fabf82e4159d8)
+++ src/Common/Heap.cc	(revision ecaeac6ed89a6845eb3b5cd67b27d8fe12736440)
@@ -14,6 +14,8 @@
 //
 
+#include <cassert>
+#include <cmath>
 #include <cstddef>
-#include <cassert>
+#include <cstring>
 #include <iomanip>
 #include <iostream>
@@ -45,8 +47,19 @@
 
 		void printStats() {
-			std::cerr << "Heap usage statistic:" << std::endl;
-			std::cerr << "Pass                 | Malloc Count |   Free Count" << std::endl;
+			size_t nc = 0;
 			for(size_t i = 0; i < passes_cnt; i++) {
-				std::cerr << std::setw(20) << passes[i].name    << " | ";
+				nc = std::max(nc, std::strlen(passes[i].name));
+			}
+
+			const char * const title = "Heap Usage Statistic";
+			for(size_t i = 0; i < (nc + 30); i++) std::cerr << '='; std::cerr << '\n';
+			for(size_t i = 0; i < (nc + 30 - std::strlen(title)) / 2; i++) std::cerr << ' ';
+			std::cerr << title << std::endl;
+			for(size_t i = 0; i < (nc + 30); i++) std::cerr << '-'; std::cerr << '\n';
+			std::cerr << std::setw(nc) << "Pass";
+			std::cerr << " | Malloc Count |   Free Count" << std::endl;
+			for(size_t i = 0; i < (nc + 30); i++) std::cerr << '-'; std::cerr << '\n';
+			for(size_t i = 0; i < passes_cnt; i++) {
+				std::cerr << std::setw(nc) << passes[i].name    << " | ";
 				std::cerr << std::setw(12) << passes[i].mallocs << " | ";
 				std::cerr << std::setw(12) << passes[i].frees   << "\n";
Index: src/main.cc
===================================================================
--- src/main.cc	(revision 01690b7043d295891fbc0a37b36fabf82e4159d8)
+++ src/main.cc	(revision ecaeac6ed89a6845eb3b5cd67b27d8fe12736440)
@@ -64,6 +64,6 @@
 
 #define PASS(name, pass)                   \
-	if ( errorp ) { cerr << #name << endl; } \
-	HeapStats::newPass(#name);               \
+	if ( errorp ) { cerr << name << endl; } \
+	HeapStats::newPass(name);               \
 	pass;
 
