refactor allDiff

use default mode in other constraints
circuit speed up

safer to do less work
slight refactoring