Fix map size assertion in parse_enum
Fix reloading diffs of staged and unstaged changes