Add back trailing whitespace and otherwise minimize nonfunctional changes
Remove TODO comments