Get rid of the ToStringComparator.

The map keys are strings anyway, use natural ordering.