Small improvement in Xponder-in/out link creation