[CXF-5944] Trying to minimize on a number of utility classes for now