Address issues found by Duncan during post-commit review of r177856.