More whitespace-only changes that fix several checkpatch errors.