Replaced 'new' comparators with calls to comparator factory.