State table reorganisation
Stack/Wire distinction: with NAT


Determining whether NAT is taking place is just a pointer comparison now.
There is nothing that says the address family has to be the same...