More work on constraints.