Various nits

None of these make the code smaller, but things I ran into trying out the code.

Thanks for publishing a maintainable version!