OK, thanks for clarifying that for me Dave Noble.
I guess the only questions i have now are:
Is there any way i can go from T4 to TBIT without having to clear security again? I don't think i have to go through immigration because i pre-clear at YYZ.
Thanks,
Malcolm