This PR fixes some typos and polishes trivial stuff.

Comment From: snicoll

@wilkinsona Ouch, sorry about that. Let me revisit based on your review.

Comment From: snicoll

I've reworked the PR in db7460d.