More TODOs cleanup.