Merge "Workaround bogus TreeMap Comparators."