Improve constraint evaluation.