Minor: there are a few locations (like this line) in these changes where trailing whitespace is included. Most editors support hooks to remove trailing whitespace on saves, and we highly recommend this. It doesn't affect functionality, but significantly cleans up diffs.