Minor TODO changes.