Yet more reformatting of the TODO list.