Clean up some TODOs and comments.