Updated calls to the refactored constraint solving modules.