This is the only substantive change in the file.  The rest was all just indenting changes.