Tidy up some TODO tasks.