Improve identifier assignment handling (CO-874)