Update executor implementations for new OutputCollector interface.