Another very-hard-to-review file, as it appears as a totally new file in the diff. Any simple suggestions about how to get a decent diff?