Fixing the comparators.  Also, hooray Java 8!