Cleaned up some TODOs.