Please avoid whitespace-only changes in the middle of a non-cleanup patch.