Refactor the inclusion of mpsolve to conform to upstream changes.