Made link tracking and Return-Path formatting less Taguchi-specific