JsonDiff: some variable renaming and comment changes