[CXF-5524] More addType fixes Patch from Denis Simonov, although hard to apply and may have missed something