diff --git a/src/hydra-queue-runner/builder.cc b/src/hydra-queue-runner/builder.cc
index 3f340c72..42b2b49e 100644
--- a/src/hydra-queue-runner/builder.cc
+++ b/src/hydra-queue-runner/builder.cc
@@ -185,7 +185,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
                     unlink(result.logFile.c_str());
                 }
             } catch (...) {
-                ignoreException();
+                ignoreExceptionExceptInterrupt();
             }
         }
     });
diff --git a/src/hydra-queue-runner/nar-extractor.cc b/src/hydra-queue-runner/nar-extractor.cc
index b3350193..df0d94e3 100644
--- a/src/hydra-queue-runner/nar-extractor.cc
+++ b/src/hydra-queue-runner/nar-extractor.cc
@@ -7,7 +7,7 @@
 
 using namespace nix;
 
-struct Extractor : ParseSink
+struct Extractor : NARParseVisitor
 {
     std::unordered_set<Path> filesToKeep {
         "/nix-support/hydra-build-products",
@@ -16,7 +16,6 @@ struct Extractor : ParseSink
     };
 
     NarMemberDatas & members;
-    NarMemberData * curMember = nullptr;
     Path prefix;
 
     Extractor(NarMemberDatas & members, Path  prefix)
@@ -28,42 +27,44 @@ struct Extractor : ParseSink
         members.insert_or_assign(prefix + path, NarMemberData { .type = FSAccessor::Type::tDirectory });
     }
 
-    void createRegularFile(const Path & path) override
+    std::unique_ptr<FileHandle> createRegularFile(const Path & path, uint64_t size, bool executable) override
     {
-        curMember = &members.insert_or_assign(prefix + path, NarMemberData {
+        MyFileHandle * hdl = new MyFileHandle();
+
+        hdl->memberData = &members.insert_or_assign(prefix + path, NarMemberData {
             .type = FSAccessor::Type::tRegular,
             .fileSize = 0,
             .contents = filesToKeep.count(path) ? std::optional("") : std::nullopt,
         }).first->second;
+
+        hdl->expectedSize = size;
+        hdl->hashSink = std::make_unique<HashSink>(HashType::SHA256);
+
+        return std::unique_ptr<MyFileHandle>(hdl);
     }
 
-    std::optional<uint64_t> expectedSize;
-    std::unique_ptr<HashSink> hashSink;
-
-    void preallocateContents(uint64_t size) override
+    struct MyFileHandle : public FileHandle
     {
-        expectedSize = size;
-        hashSink = std::make_unique<HashSink>(HashType::SHA256);
-    }
+        uint64_t expectedSize;
+        std::unique_ptr<HashSink> hashSink;
+        NarMemberData * memberData;
 
-    void receiveContents(std::string_view data) override
-    {
-        assert(expectedSize);
-        assert(curMember);
-        assert(hashSink);
-        *curMember->fileSize += data.size();
-        (*hashSink)(data);
-        if (curMember->contents) {
-            curMember->contents->append(data);
+        void receiveContents(std::string_view data) override
+        {
+            *memberData->fileSize += data.size();
+            (*hashSink)(data);
+            if (memberData->contents) {
+                memberData->contents->append(data);
+            }
+            assert(memberData->fileSize <= expectedSize);
+            if (memberData->fileSize == expectedSize) {
+                auto [hash, len] = hashSink->finish();
+                assert(memberData->fileSize == len);
+                memberData->sha256 = hash;
+                hashSink.reset();
+            }
         }
-        assert(curMember->fileSize <= expectedSize);
-        if (curMember->fileSize == expectedSize) {
-            auto [hash, len] = hashSink->finish();
-            assert(curMember->fileSize == len);
-            curMember->sha256 = hash;
-            hashSink.reset();
-        }
-    }
+    };
 
     void createSymlink(const Path & path, const std::string & target) override
     {