[PDT-5578] Clean up ExecutorIterator