Fix assignment cleanup.