Remove lots of no-longer-necessary changes
Fix diff commenting width
Fix split-diff width conflicts