This should be `compat.OrderedDict(d)` if we want to *always* return an OrderedDict.