Fixups for PR #83

Hopefully these are easy to review and apply. ;)