Removed unnecessary changes from some diffs.

Though the cint change is actually necessary, but it's already part of
the latest Bash source, I checked.