Fix regression in code-generation caused by cleanup.