Fix up r137380 based on post-commit review by Jim Grosbach.