To be fair... I think there is a decent argument to be made that only container-managed EMFs should deal with the SM at all.

That said, if we can get a better idea of what exactly needs to changes, where it needs to change and it is not a horrific effort to make those changes - we should make said changes