Improvements mentioned by sthen@.
Merge branch 'master' of github.com:jasperla/openbsd-wip