Minor cleanup from #1665.