MINOR: Updated TODO in light of recent changes