This commit is a straightforward code cleanup of the Elasticsearch 5 transport client and REST client implementations.