Simplify constraints matching