Fold versions with and without comparator into one

Use default template-argument std14::less<> for the Comparator type.
Thanks to Niels Dekker for the suggestion.