[CXF-5944] More refactorings