Improve constraint priority ordering