Revised work on OpenSearch autoconfiguration

Thanks to Matt Ramey (mrmateo) for the suggestions