Added back public MASConstraint constant setters, cleanup