Adjust unique declaration logic