This is the actual change to the code. All others (in this file) are auto removals of whitespace.