Clean up a few irrelevant TODOs.