Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision 71f4e4f59e25d1ae31af19227f4d2a8a9365bac7)
+++ src/CodeGen/CodeGenerator.cc	(revision f1e012b7aa1aaea6aa2dde9bcb3b0e83dcf13824)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jan 13 16:26:59 2016
-// Update Count     : 234
+// Last Modified On : Tue Jan 19 13:15:44 2016
+// Update Count     : 251
 //
 
@@ -258,9 +258,17 @@
 
 				  case OT_CALL:
-				  case OT_CTOR:
-				  case OT_DTOR:
 					// there are no intrinsic definitions of the function call operator or constructors or destructors
 					assert( false );
 					break;
+
+				  case OT_CTOR:
+				  // intrinsic constructors should never be called directly - they should be transformed back into Initializer nodes
+				  assert(false);
+				  break;
+
+				  case OT_DTOR:
+				  // intrinsic destructors do nothing - don't generate any code
+				  output << " // " << dynamic_cast<VariableExpr*>(applicationExpr->get_function())->get_var()->get_name() << endl;
+				  break;
 
 				  case OT_PREFIX:
@@ -279,4 +287,5 @@
 					output << opInfo.symbol;
 					break;
+
 
 				  case OT_INFIX:
@@ -324,7 +333,10 @@
 
 				  case OT_CALL:
+					assert( false );
+
 					case OT_CTOR:
 					case OT_DTOR:
-					assert( false );
+					// intrinsic constructors should never be called
+					// intrinsic destructors do nothing
 					break;
 
