diff --git a/SECURITY.md b/SECURITY.md
index 447111f1be..8e5012dff1 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -3,7 +3,7 @@
 ## Supported Versions
 
 | Version | Supported          |
-| ------- | ------------------ |
+|---------|--------------------|
 | All     | :white_check_mark: |
 
 ## Reporting a Vulnerability
diff --git a/coil-base/src/androidTest/java/coil/EventListenerTest.kt b/coil-base/src/androidTest/java/coil/EventListenerTest.kt
index a054f435c3..aa47006658 100644
--- a/coil-base/src/androidTest/java/coil/EventListenerTest.kt
+++ b/coil-base/src/androidTest/java/coil/EventListenerTest.kt
@@ -196,7 +196,7 @@ class EventListenerTest {
 
     private suspend fun ImageLoader.testEnqueue(
         builder: ImageRequest.Builder.() -> Unit
-    ) = suspendCancellableCoroutine<Unit> { continuation ->
+    ) = suspendCancellableCoroutine { continuation ->
         val request = ImageRequest.Builder(context)
             .size(100, 100)
             .target(activityRule.scenario.activity.imageView)
diff --git a/coil-base/src/androidTest/java/coil/RealImageLoaderAndroidTest.kt b/coil-base/src/androidTest/java/coil/RealImageLoaderAndroidTest.kt
index 48fdf77f61..196eb4a50c 100644
--- a/coil-base/src/androidTest/java/coil/RealImageLoaderAndroidTest.kt
+++ b/coil-base/src/androidTest/java/coil/RealImageLoaderAndroidTest.kt
@@ -241,7 +241,7 @@ class RealImageLoaderAndroidTest {
         val error = ColorDrawable(Color.BLUE)
         val fallback = ColorDrawable(Color.BLACK)
 
-        suspendCancellableCoroutine<Unit> { continuation ->
+        suspendCancellableCoroutine { continuation ->
             var hasCalledTargetOnError = false
 
             val request = ImageRequest.Builder(context)
@@ -295,7 +295,7 @@ class RealImageLoaderAndroidTest {
         val fileName = IMAGE
         val bitmap = decodeAssetAndAddToMemoryCache(key, fileName)
 
-        suspendCancellableCoroutine<Unit> { continuation ->
+        suspendCancellableCoroutine { continuation ->
             val request = ImageRequest.Builder(context)
                 .memoryCacheKey(key)
                 .placeholderMemoryCacheKey(key)
@@ -621,7 +621,7 @@ class RealImageLoaderAndroidTest {
 
         assertNull(imageView.drawable)
 
-        suspendCancellableCoroutine<Unit> { continuation ->
+        suspendCancellableCoroutine { continuation ->
             val request = ImageRequest.Builder(context)
                 .data(data)
                 .target(imageView)
diff --git a/coil-base/src/main/java/coil/disk/DiskLruCache.kt b/coil-base/src/main/java/coil/disk/DiskLruCache.kt
index 3ea45f7a5b..24552a9597 100644
--- a/coil-base/src/main/java/coil/disk/DiskLruCache.kt
+++ b/coil-base/src/main/java/coil/disk/DiskLruCache.kt
@@ -547,9 +547,6 @@ internal class DiskLruCache(
             return true
         }
 
-        // Prevent the edit from completing normally.
-        entry.currentEditor?.detach()
-
         for (i in 0 until valueCount) {
             fileSystem.delete(entry.cleanFiles[i])
             size -= entry.lengths[i]
@@ -586,10 +583,8 @@ internal class DiskLruCache(
 
         // Copying for concurrent iteration.
         for (entry in lruEntries.values.toTypedArray()) {
-            if (entry.currentEditor != null) {
-                // Prevent the edit from completing normally.
-                entry.currentEditor?.detach()
-            }
+            // Prevent the edit from completing normally.
+            entry.currentEditor?.detach()
         }
 
         trimToSize()
diff --git a/coil-base/src/main/java/coil/util/Lifecycles.kt b/coil-base/src/main/java/coil/util/Lifecycles.kt
index a7c483b161..d62376db7b 100644
--- a/coil-base/src/main/java/coil/util/Lifecycles.kt
+++ b/coil-base/src/main/java/coil/util/Lifecycles.kt
@@ -20,7 +20,7 @@ internal suspend fun Lifecycle.awaitStarted() {
     // Slow path: observe the lifecycle until we're started.
     var observer: LifecycleObserver? = null
     try {
-        suspendCancellableCoroutine<Unit> { continuation ->
+        suspendCancellableCoroutine { continuation ->
             observer = object : DefaultLifecycleObserver {
                 override fun onStart(owner: LifecycleOwner) {
                     continuation.resume(Unit)
diff --git a/coil-base/src/test/java/coil/transition/CrossfadeTransitionTest.kt b/coil-base/src/test/java/coil/transition/CrossfadeTransitionTest.kt
index 15decaadd7..48dc73b547 100644
--- a/coil-base/src/test/java/coil/transition/CrossfadeTransitionTest.kt
+++ b/coil-base/src/test/java/coil/transition/CrossfadeTransitionTest.kt
@@ -110,13 +110,11 @@ class CrossfadeTransitionTest {
         crossinline onStart: (placeholder: Drawable?) -> Unit = { fail() },
         crossinline onError: (error: Drawable?) -> Unit = { fail() },
         crossinline onSuccess: (result: Drawable) -> Unit = { fail() }
-    ): TransitionTarget {
-        return object : TransitionTarget {
-            override val view = imageView
-            override val drawable: Drawable? get() = imageView.drawable
-            override fun onStart(placeholder: Drawable?) = onStart(placeholder)
-            override fun onError(error: Drawable?) = onError(error)
-            override fun onSuccess(result: Drawable) = onSuccess(result)
-        }
+    ) = object : TransitionTarget {
+        override val view = imageView
+        override val drawable: Drawable? get() = imageView.drawable
+        override fun onStart(placeholder: Drawable?) = onStart(placeholder)
+        override fun onError(error: Drawable?) = onError(error)
+        override fun onSuccess(result: Drawable) = onSuccess(result)
     }
 }