Change to parameter naming, plus function to strip out the P-Visited-Network-Id header when crossing trust boundaries