Moved the delete-after support into generator.c.