Changes to allow the current objective functions to create valid Constraint objects.