Handle maps better in diffs