Cleaned up some scattered TODOs.