Update TODO after merge.