More tweaks to try to catchup to recent pf changes.
pfopt5 part from sthen@

ok henning@ sthen@

Regress tests for explicit nat translation port.