So my YYZ-NRT-YYZ trip just got worse: after a corporate travel agency mess-up, I ended up having to rebook my flights at 11:30 last night, and ended up with an MR-like NRT-YVR-YUL-YYZ return portion, with an overnight in YUL. I will try to improve this on the day of travel at NRT -- but I have a question. My return leg is noted as Tango: Tango H/Tango H/Tango E. I thought H should be Tango+, although the E is surely a Tango (for the YUL-YYZ). Does the entire return get designated as Tango rather than Tango+ because of the final segment? And does that mean I won't be able to use an eUpgrade for the return, even for the first two segments?