Cleaned up CSP interface. Calculating constraint pairs upfront.