todo.rst: Finish refactoring