Minimize spurious changes, so that we match debian more closely.