Merge remaining TODO items into CVS page, and delete TODO.cvs.