Index: src/SynTree/Expression.cc
===================================================================
--- src/SynTree/Expression.cc	(revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f)
+++ src/SynTree/Expression.cc	(revision aefcc3b4bc74c06dfe70a46ab130a8295ab26c3c)
@@ -318,4 +318,5 @@
 void UntypedMemberExpr::print( std::ostream &os, int indent ) const {
 	os << "Untyped Member Expression, with field: " << std::endl;
+	os << std::string( indent+2, ' ' );
 	get_member()->print(os, indent+4);
 	os << std::string( indent+2, ' ' );
Index: src/SynTree/Type.h
===================================================================
--- src/SynTree/Type.h	(revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f)
+++ src/SynTree/Type.h	(revision aefcc3b4bc74c06dfe70a46ab130a8295ab26c3c)
@@ -20,4 +20,5 @@
 #include "Visitor.h"
 #include "Mutator.h"
+#include "Common/utility.h"
 
 class Type {
@@ -64,5 +65,7 @@
 	void set_isAtomic( bool newValue ) { tq.isAtomic = newValue; }
 	void set_isAttribute( bool newValue ) { tq.isAttribute = newValue; }
-	std::list<TypeDecl*>& get_forall() { return forall; }
+
+	typedef std::list<TypeDecl *> ForallList;
+	ForallList& get_forall() { return forall; }
 
 	/// How many elemental types are represented by this type
@@ -76,5 +79,5 @@
   private:
 	Qualifiers tq;
-	std::list<TypeDecl*> forall;
+	ForallList forall;
 };
 
Index: src/SynTree/TypeSubstitution.cc
===================================================================
--- src/SynTree/TypeSubstitution.cc	(revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f)
+++ src/SynTree/TypeSubstitution.cc	(revision aefcc3b4bc74c06dfe70a46ab130a8295ab26c3c)
@@ -72,23 +72,23 @@
 Type *TypeSubstitution::lookup( std::string formalType ) const {
 	TypeEnvType::const_iterator i = typeEnv.find( formalType );
-	
+
 	// break on not in substitution set
 	if ( i == typeEnv.end() ) return 0;
-	
+
 	// attempt to transitively follow TypeInstType links.
 	while ( TypeInstType *actualType = dynamic_cast< TypeInstType* >( i->second ) ) {
 		const std::string& typeName = actualType->get_name();
-		
+
 		// break cycles in the transitive follow
 		if ( formalType == typeName ) break;
-		
+
 		// Look for the type this maps to, returning previous mapping if none-such
 		i = typeEnv.find( typeName );
 		if ( i == typeEnv.end() ) return actualType;
 	}
-	
+
 	// return type from substitution set
 	return i->second;
-	
+
 #if 0
 	if ( i == typeEnv.end() ) {
@@ -149,5 +149,5 @@
 	// bind type variables from forall-qualifiers
 	if ( freeOnly ) {
-		for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+		for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
 			boundVars.insert( (*tyvar )->get_name() );
 		} // for
@@ -163,5 +163,5 @@
 	// bind type variables from forall-qualifiers
 	if ( freeOnly ) {
-		for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+		for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
 			boundVars.insert( (*tyvar )->get_name() );
 		} // for