More tweaks from my read-through
Merge pull request #74 from nedbat/master

More tweaks from my read-through