Wrap lines at 80 characters.
Remove a few resolved TODOs.