Fix a typo I introduced in previous revision
dict(x if x is not None else None) != dict(x) if x is not None else None...