Update TODOs to match new Github issues.