Diff cleanup.