CXF-5311 Minor optimization