Adjust event reporting to account for piecewise

Currently, unstructured event reporting was only done if customers used the simple decrypt method that wrapped stages. This meant if they used methods to try and reuse encryption/decryption objects, events were not being reported.

Changes where the event reporting happens to support this use case better.