Reduce complexity in Comma::DataExtractor