Refactor to move decl update emission into the decl emission loop.