Make word-wrap work, fix comments on split diff.