[TIMOB-16979] More tweaks to the analytics handling to prevent analytics...

... from being run more than once at a time.