be more consistent about using utils.parseConstraint in the tool; test for either-version