Update TODOs.
Fix compiler warning on some versions of Xcode.