Fix nitpick about new/old API from #653.