Refactored FlatZinc patterns