We can clean up ElasticsearchIndexWorkVisitor#convertToJson to not check the actual types of the fields as we require using MetadataProvidingFieldBridge in the Elasticsearch case so the required type metadata is going to be available.