Clean up some of the todos.