Address feedback from PR #203

Fix some typos, style issues, and remove the natural-language-like
expressions from the tests.