Simplify constraints slightly.