Don't need to explicitly AND boundaryConstraint with the problem constraint, since the incremental solver already does this
Move the boundary finding to its own method