Refactor HTLCForwardInfo::AddHTLC for intercept forwards