Simplify comparators of [unordered_][multi]map.  This fixes http://llvm.org/bugs/show_bug.cgi?id=16538