Some more `i.e.` and `e.g.` changes

Following up to my #3748 pull request.
Do not make any changes to code in the `extern` directory.  They are external libraries.