[UPDATE] remove type-checking of comparator.
[UPDATE] remove comparator type-checking.