[PATCH 09/11] Add more stuff to the TODO list.