I think it's OK for now: we won ServiceActivator and further refactoring should be addressed in separate JIRAs.
If it needed, of course, according your explanation.