(maint) Make 3x conversion use verbatim types for non Host/Resource.