Add two patch files forgotten in the previous commit, and clean up
a portlint warning.

Submitted by: Jim Bloom <bloom@acm.org>