CXF-6118 various cleanups and refinements to the fallback logic to remain compatible with what's already in place