You are correct. My bad. I've been on a 3 day bender and the thinker is not working correctly.
Everything I've said concerning this is wrong.
Having said that, even the ALPA calendar is incorrect on the sub decision tree. It asks if the "original trip was less than 72hrs AFB". But, as you've pointed out, the contract adds 8 hrs to the original trip's AFB to determine if you're in short or long sub.
Details...