Various bug fixes.
Merge branch 'master' of github.com:cojen/Cojen