Index: src/Common/Indenter.h
===================================================================
--- src/Common/Indenter.h	(revision 99d45847f7626033f67b33afdf3e149972c747b0)
+++ src/Common/Indenter.h	(revision 4e5e6cc70090e807822b56cfc8f3dc1ddaae698e)
@@ -23,9 +23,9 @@
 	unsigned int amt;         ///< spaces in one level of indentation
 
-	Indenter( unsigned int indent = 0, unsigned int amt = tabsize ) 
-	: indent( indent*amt ), amt( amt ) {}
-	
-	Indenter & operator+=(int nlevels) { indent += amt*nlevels; return *this; }
-	Indenter & operator-=(int nlevels) { indent -= amt*nlevels; return *this; }
+	Indenter( unsigned int indent = 0, unsigned int amt = tabsize )
+	: indent( indent ), amt( amt ) {}
+
+	Indenter & operator+=(int nlevels) { indent += nlevels; return *this; }
+	Indenter & operator-=(int nlevels) { indent -= nlevels; return *this; }
 	Indenter operator+(int nlevels) { Indenter indenter = *this; return indenter += nlevels; }
 	Indenter operator-(int nlevels) { Indenter indenter = *this; return indenter -= nlevels; }
@@ -35,5 +35,5 @@
 
 inline std::ostream & operator<<( std::ostream & out, const Indenter & indent ) {
-	return out << std::string(indent.indent, ' ');
+	return out << std::string(indent.indent * indent.amt, ' ');
 }