thats it. Not much hassle to do it just before you leave, just to be sure. The date given for the next report, no need to do as you'll be due 90 days after your return.
What confuses me is that on various sites some say you can get a non-O multi extension some say you cant. I'll find out for sure when I go to CM immigration this week.