[CXF-6121] Minor refactoring