Update to modification of constraint definitions in hpp-constraints.