Fixed typos as per comments in #r17244847