Changed to one constraint per row/column/diagonal.