[PATCH 0/8] Clean up and fix bugs in port forwarding data structures