Generalization/refact. of correlation constraints

Tests/fixes will follow.