Get rid of some TODOs.