Apologies to @taustin for highjacking the thread. The first best solution for Tanya is yours and John’s.
Moving forward, I made this suggestion here on EpiUsers (no votes to add to Ideas at the moment).
This needs to be done in steps but the first one is encouraging users to use the Single Responsibility Principle. Move the job of notification out of the business logic. For the rest, I’ll start a new thread or finish that damn LinkedIn article.