More NAT code clean up