Improve HeaderWrapper::wrapStructured()