Cleaning up the TODO list briefly.