- Changed to use common Comparators class.