Cleanup: reduce diffs from cf-release to make it easier to merge.