From here to line 248 are whitespace and comment fixes.