diff --git a/clients/drcachesim/tests/decode_cache_test.cpp b/clients/drcachesim/tests/decode_cache_test.cpp
index 07d125de7b3..220fb33dbf6 100644
--- a/clients/drcachesim/tests/decode_cache_test.cpp
+++ b/clients/drcachesim/tests/decode_cache_test.cpp
@@ -205,7 +205,7 @@ test_main(int argc, const char *argv[])
         exit(1);
     }
 #ifndef WINDOWS
-    // TODO i#5960: Enable these tests after the Windows issue is
+    // TODO i#5960: Enable these tests after the test-only Windows issue is
     // fixed.
     err = check_decode_caching(drcontext, /*persist_instrs=*/false,
                                /*use_module_mapper=*/true);
diff --git a/clients/drcachesim/tests/opcode_mix_test.cpp b/clients/drcachesim/tests/opcode_mix_test.cpp
index 56bba58ba94..da600ce1485 100644
--- a/clients/drcachesim/tests/opcode_mix_test.cpp
+++ b/clients/drcachesim/tests/opcode_mix_test.cpp
@@ -140,7 +140,7 @@ test_main(int argc, const char *argv[])
         exit(1);
     }
 #ifndef WINDOWS
-    // TODO i#5960: Enable these tests after the Windows issue is
+    // TODO i#5960: Enable these tests after the test-only Windows issue is
     // fixed.
     err = check_opcode_mix(drcontext, /*use_module_mapper=*/true);
     if (err != "") {
diff --git a/clients/drcachesim/tools/common/decode_cache.h b/clients/drcachesim/tools/common/decode_cache.h
index 033ef8f32ea..0909d854893 100644
--- a/clients/drcachesim/tools/common/decode_cache.h
+++ b/clients/drcachesim/tools/common/decode_cache.h
@@ -321,6 +321,10 @@ template <class DecodeInfo> class decode_cache_t : public decode_cache_base_t {
     init(offline_file_type_t filetype, const std::string &module_file_path = "",
          const std::string &alt_module_dir = "")
     {
+        // TODO i#7113: Should we perhaps also do dr_set_isa_mode for DR_ISA_REGDEPS
+        // that cannot be figured out automatically using the build but needs the
+        // trace filetype? Or does that belong in the analyzer framework which is more
+        // central than this decode_cache_t.
         init_done_ = true;
         if (!TESTANY(OFFLINE_FILE_TYPE_ENCODINGS, filetype) && module_file_path.empty()) {
             return "Trace does not have embedded encodings, and no module_file_path "