Improvements as suggested on pkgsrc-wip-review.