Index: src/InitTweak/FixInit.cc
===================================================================
--- src/InitTweak/FixInit.cc	(revision 2f86ddf839c92a4a8670497106e33770cf52c2bc)
+++ src/InitTweak/FixInit.cc	(revision 9b086ca2959663e286c91675283ffe66e80cf7e0)
@@ -558,9 +558,9 @@
 			Expression * dtor = makeCtorDtor( "^?{}", ret );
 
-			// // xxx - check if intrinsic and elide if so
-			// if ( arg && isIntrinsicCallExpr( dtor ) ) {
-			// 	arg = new CommaExpr( arg, new VariableExpr( ret ) );
-			// 	return;
-			// }
+			// if the chosen destructor is intrinsic, elide the generated dtor handler
+			if ( arg && isIntrinsicCallExpr( dtor ) ) {
+				arg = new CommaExpr( arg, new VariableExpr( ret ) );
+				return;
+			}
 
 			if ( ! dtor->env ) dtor->env = maybeClone( env );