Updated both solver wrappers (removed unsafe dependency from model).