Cleanup to produce fewer diffs with upstream