ENH:  More accommodations for point set metric.