Cleanup from review

- More quotes in more places.
- Fix a typo.