Simplified column reference matching
Added test for constraint conjunctions