Bug 5228: Use custom comparator for mappings