diff --git a/Makefile b/Makefile
index 92d18709..6549b0d8 100644
--- a/Makefile
+++ b/Makefile
@@ -157,13 +157,13 @@ CMakeUserPresets.json:: cmake/CMakeUserPresets.json
 	ln -s $< $@
 
 # ==========================================================
-appleclang-release llvm-release release: #-dk: I'm not sure why that is needed: CMakeUserPresets.json
+appleclang-release llvm-release release:
 	cmake --preset $@ --log-level=TRACE # XXX --fresh
 	ln -fs $(BUILDROOT)/$@/compile_commands.json .
 	cmake --workflow --preset $@
 
 # ==========================================================
-appleclang-debug llvm-debug debug: #-dk: I'm not sure why that is needed: CMakeUserPresets.json
+appleclang-debug llvm-debug debug:
 	cmake --preset $@ --log-level=TRACE # XXX --fresh
 	ln -fs $(BUILDROOT)build/$@/compile_commands.json .
 	cmake --workflow --preset $@
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 464d782f..c68e6e17 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -37,7 +37,6 @@ set(EXAMPLES
 if(BEMAN_USE_MODULES)
     list(APPEND EXAMPLES modules) # modules.cpp
 endif()
-# set(EXAMPLES)
 
 foreach(EXAMPLE ${EXAMPLES})
     set(EXAMPLE_TARGET ${PROJECT_NAME}.${EXAMPLE})
diff --git a/examples/stackoverflow.cpp b/examples/stackoverflow.cpp
index 617e2f2d..1f058b53 100644
--- a/examples/stackoverflow.cpp
+++ b/examples/stackoverflow.cpp
@@ -1,4 +1,4 @@
-// examples/allocator.cpp                                             -*-C++-*-
+// examples/stackoverflow.cpp                                         -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <coroutine>
diff --git a/include/beman/execution/detail/bulk.hpp b/include/beman/execution/detail/bulk.hpp
index 5508b18c..d4613a1a 100644
--- a/include/beman/execution/detail/bulk.hpp
+++ b/include/beman/execution/detail/bulk.hpp
@@ -5,8 +5,8 @@
 #define INCLUDED_BEMAN_EXECUTION_DETAIL_BULK
 
 #include <beman/execution/detail/common.hpp>
-#include "beman/execution/detail/sender_adaptor.hpp"
-#include "beman/execution/detail/sender_adaptor_closure.hpp"
+#include <beman/execution/detail/sender_adaptor.hpp>
+#include <beman/execution/detail/sender_adaptor_closure.hpp>
 #include <beman/execution/detail/get_completion_signatures.hpp>
 #include <beman/execution/detail/meta_combine.hpp>
 #include <beman/execution/detail/meta_unique.hpp>
diff --git a/include/beman/execution/detail/decayed_type_list.hpp b/include/beman/execution/detail/decayed_type_list.hpp
index 9e6deb2a..81d720cd 100644
--- a/include/beman/execution/detail/decayed_type_list.hpp
+++ b/include/beman/execution/detail/decayed_type_list.hpp
@@ -5,7 +5,7 @@
 #define INCLUDED_BEMAN_EXECUTION_DETAIL_DECAYED_TYPE_LIST
 
 #include <beman/execution/detail/common.hpp>
-#include "beman/execution/detail/type_list.hpp"
+#include <beman/execution/detail/type_list.hpp>
 #include <type_traits>
 
 // ----------------------------------------------------------------------------
diff --git a/src/beman/execution/execution.cppm b/src/beman/execution/execution.cppm
index 1a954b35..e54eb38a 100644
--- a/src/beman/execution/execution.cppm
+++ b/src/beman/execution/execution.cppm
@@ -991,7 +991,8 @@ namespace beman::execution::detail {
 
 export /* --------- */ template <typename Sender>
 using indices_for = typename ::std::remove_reference_t<Sender>::indices_for;
-}
+} // namespace beman::execution::detail
+
 #line 12 "include/beman/execution/detail/decayed_typeof.hpp"
 namespace beman::execution::detail {
 
@@ -3873,7 +3874,7 @@ struct sync_wait_receiver {
         }
         this->state->loop.finish();
     }
-#line 73 "include/beman/execution/detail/sync_wait.hpp"
+#line 74 "include/beman/execution/detail/sync_wait.hpp"
     auto get_env() const noexcept -> ::beman::execution::detail::sync_wait_env {
         return ::beman::execution::detail::sync_wait_env{&this->state->loop};
     }
@@ -3893,7 +3894,7 @@ struct sync_wait_t {
         }
         return ::std::move(state.result);
     }
-#line 93 "include/beman/execution/detail/sync_wait.hpp"
+#line 94 "include/beman/execution/detail/sync_wait.hpp"
     template <::beman::execution::sender_in<::beman::execution::detail::sync_wait_env> Sender>
         requires requires(Sender&& sender, const sync_wait_t& self) {
             typename ::beman::execution::detail::sync_wait_result_type<Sender>;
@@ -3914,7 +3915,7 @@ struct sync_wait_t {
 namespace beman::execution {
 export /* --------- */ using sync_wait_t = ::beman::execution::detail::sync_wait_t;
 
-#line 159 "include/beman/execution/detail/sync_wait.hpp"
+#line 160 "include/beman/execution/detail/sync_wait.hpp"
 export /* --------- */ inline constexpr ::beman::execution::sync_wait_t sync_wait{};
 } // namespace beman::execution
 
diff --git a/tests/beman/execution/CMakeLists.txt b/tests/beman/execution/CMakeLists.txt
index 7e5cd496..65238e5c 100644
--- a/tests/beman/execution/CMakeLists.txt
+++ b/tests/beman/execution/CMakeLists.txt
@@ -107,7 +107,6 @@ list(
     thread.test
     utilities.test
 )
-# set(execution_tests <test>.test)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
diff --git a/tests/beman/execution/exec-bulk.test.cpp b/tests/beman/execution/exec-bulk.test.cpp
index 0678f288..fe07c772 100644
--- a/tests/beman/execution/exec-bulk.test.cpp
+++ b/tests/beman/execution/exec-bulk.test.cpp
@@ -7,11 +7,11 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include "beman/execution/detail/bulk.hpp"
-#include "beman/execution/detail/just.hpp"
-#include "beman/execution/detail/get_completion_signatures.hpp"
-#include "beman/execution/detail/get_env.hpp"
-#include "beman/execution/detail/sync_wait.hpp"
+#include <beman/execution/detail/bulk.hpp>
+#include <beman/execution/detail/just.hpp>
+#include <beman/execution/detail/get_completion_signatures.hpp>
+#include <beman/execution/detail/get_env.hpp>
+#include <beman/execution/detail/sync_wait.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/include/test/stop_token.hpp b/tests/beman/execution/include/test/stop_token.hpp
index cb93287c..87b8eb50 100644
--- a/tests/beman/execution/include/test/stop_token.hpp
+++ b/tests/beman/execution/include/test/stop_token.hpp
@@ -20,7 +20,7 @@
 #include <mutex>
 #include <ranges>
 #include <thread>
-#if false && defined(BEMAN_HAS_MODULES)
+#if false && defined(BEMAN_HAS_MODULES) //-dk:TODO module disabled
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stopsource-general.test.cpp b/tests/beman/execution/stopsource-general.test.cpp
index c181f05e..845c4079 100644
--- a/tests/beman/execution/stopsource-general.test.cpp
+++ b/tests/beman/execution/stopsource-general.test.cpp
@@ -4,7 +4,7 @@
 #include <test/execution.hpp>
 #include <test/stop_token.hpp>
 #include <cassert>
-#if false && defined(BEMAN_HAS_MODULES)
+#if false && defined(BEMAN_HAS_MODULES) //-dk:TODO module disabled
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stopsource-inplace-general.test.cpp b/tests/beman/execution/stopsource-inplace-general.test.cpp
index e7f813a1..3e8dfa67 100644
--- a/tests/beman/execution/stopsource-inplace-general.test.cpp
+++ b/tests/beman/execution/stopsource-inplace-general.test.cpp
@@ -3,7 +3,7 @@
 
 #include <test/execution.hpp>
 #include <test/stop_token.hpp>
-#if false && defined(BEMAN_HAS_MODULES)
+#if false && defined(BEMAN_HAS_MODULES) //-dk:TODO module disabled
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stoptoken-general.test.cpp b/tests/beman/execution/stoptoken-general.test.cpp
index 40a59e7b..aa89d74f 100644
--- a/tests/beman/execution/stoptoken-general.test.cpp
+++ b/tests/beman/execution/stoptoken-general.test.cpp
@@ -3,7 +3,7 @@
 
 #include <test/execution.hpp>
 #include <test/stop_token.hpp>
-#if false && defined(BEMAN_HAS_MODULES)
+#if false && defined(BEMAN_HAS_MODULES) //-dk:TODO module disabled
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stoptoken-mem.test.cpp b/tests/beman/execution/stoptoken-mem.test.cpp
index 1939d3a3..8842756f 100644
--- a/tests/beman/execution/stoptoken-mem.test.cpp
+++ b/tests/beman/execution/stoptoken-mem.test.cpp
@@ -5,7 +5,7 @@
 #include <memory>
 #include <test/execution.hpp>
 #include <test/stop_token.hpp>
-#if false && defined(BEMAN_HAS_MODULES)
+#if false && defined(BEMAN_HAS_MODULES) //-dk:TODO module disabled
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/thread-stoptoken-intro.test.cpp b/tests/beman/execution/thread-stoptoken-intro.test.cpp
index 7d68b80c..198c769b 100644
--- a/tests/beman/execution/thread-stoptoken-intro.test.cpp
+++ b/tests/beman/execution/thread-stoptoken-intro.test.cpp
@@ -5,7 +5,7 @@
 #include <test/execution.hpp>
 #include <test/stop_token.hpp>
 #include <utility>
-#if false && defined(BEMAN_HAS_MODULES)
+#if false && defined(BEMAN_HAS_MODULES) //-dk:TODO module disabled
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>