Follow-up work from #713 As suggested by @bording in [this comment](https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/713#issuecomment-586427775)