diff --git a/src/record_ts.cpp b/src/record_ts.cpp
index c9e1a95d..d8838dfb 100644
--- a/src/record_ts.cpp
+++ b/src/record_ts.cpp
@@ -660,10 +660,6 @@ int Recording::replay(const uint32_t *replay_inputs, uint32_t *outputs) {
                                  " -> slot(%u, is_pointer=%u, offset=%u)",
                                  param.slot, param.pointer_access,
                                  param.extra.offset);
-                        // HACK: Had to disable this, but I don't understand
-                        // why? if(rv.data == nullptr && !dry_run )
-                        //     jitc_fail("replay(): Encountered nullptr in
-                        //     parameter s%u.", param.slot);
 
                         if (rv.init == RecordVarInit::Captured) {
                             jitc_log(LogLevel::Debug, "    captured");
diff --git a/src/record_ts.h b/src/record_ts.h
index afeacb47..6df7c8ca 100644
--- a/src/record_ts.h
+++ b/src/record_ts.h
@@ -703,12 +703,12 @@ struct RecordThreadState : ThreadState {
 
     /**
      * This function tries to capture a variable that is not known to the
-     * recording threadstate.
+     * recording \c ThreadState.
      * This is unsupported for now and raises an exception.
      */
-    uint32_t capture_variable(uint32_t index, const void *ptr = nullptr,
-                              bool remember = true, bool test_scope = true,
-                              bool overwrite = false) {
+    uint32_t capture_variable(uint32_t index, const void */*ptr*/ = nullptr,
+                              bool /*remember*/ = true, bool test_scope = true,
+                              bool /*overwrite*/ = false) {
 
         scoped_pause();
         Variable *v = jitc_var(index);