Tidy up presentation of constraints.