Add <port-remove-request> and friends