Touch-ups following comments by @mdboom