Address some TODOs.