If I can get the testsuite to complete I want to get this merged today. So I'm thinking about just @Deprecate ing NotificationSupport.emit() and adding it as a method on OperationContext. That will warn any Alpha1 user who uses NotificationSupport.emit() that it may change, while still leaving the emit() method visible in OperationContext, where it belongs. The test case uses of NotificationSupport.emit() that I see can be cleaned up later.