Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision c194661e377fb587400b93fef5a817d3d77ac641)
+++ src/CodeGen/CodeGenerator.cc	(revision b16923de6f07e4eecb90f192170e17226caab592)
@@ -164,5 +164,5 @@
 		previsit( (BaseSyntaxNode *)node );
 		GuardAction( [this, node](){
-			if ( printExprTypes ) {
+			if ( printExprTypes && node->result ) {
 				output << " /* " << genType( node->result, "", pretty, genC ) << " */ ";
 			}
@@ -224,8 +224,8 @@
 
 	void CodeGenerator::handleAggregate( AggregateDecl * aggDecl, const std::string & kind ) {
-		if( ! aggDecl->get_parameters().empty() && ! genC ) {
+		if( ! aggDecl->parameters.empty() && ! genC ) {
 			// assertf( ! genC, "Aggregate type parameters should not reach code generation." );
 			output << "forall(";
-			genCommaList( aggDecl->get_parameters().begin(), aggDecl->get_parameters().end() );
+			genCommaList( aggDecl->parameters.begin(), aggDecl->parameters.end() );
 			output << ")" << endl;
 			output << indent;
@@ -233,9 +233,9 @@
 
 		output << kind;
-		genAttributes( aggDecl->get_attributes() );
-		output << aggDecl->get_name();
+		genAttributes( aggDecl->attributes );
+		output << aggDecl->name;
 
 		if ( aggDecl->has_body() ) {
-			std::list< Declaration * > & memb = aggDecl->get_members();
+			std::list< Declaration * > & memb = aggDecl->members;
 			output << " {" << endl;