Taking into account remarks from logstash-contrib PR4