diff --git a/.github/workflows/swift.yaml b/.github/workflows/swift.yaml
index 386656644..ea3cc07ab 100644
--- a/.github/workflows/swift.yaml
+++ b/.github/workflows/swift.yaml
@@ -82,3 +82,13 @@ jobs:
     - name: Swiftdocs
       run: |
         .buildscript/build_swift_docs.sh ${{ runner.temp }}/swiftdocs
+
+  swiftformat:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: jdx/mise-action@v2
+
+    - name: Run swiftformat
+      run: swiftformat --lint .
diff --git a/.hooks/pre-commit b/.hooks/pre-commit
index eaa6fa8ff..deed94894 100755
--- a/.hooks/pre-commit
+++ b/.hooks/pre-commit
@@ -1,7 +1,17 @@
 #!/bin/bash
 
-swift_files=$(git diff --diff-filter=d --staged --name-only -- '*.swift')
+# Do not run on merge
+if [[ $(git rev-parse -q --verify MERGE_HEAD) ]]; then
+    exit 0
+fi
 
-echo $swift_files | xargs swift run swiftformat --quiet
+ROOT="$(git rev-parse --show-toplevel)"
+SWIFT_FORMAT="mise x -- swiftformat"
+GIT_FORMAT_STAGED="$ROOT/Scripts/git-format-staged"
+CONFIG="${ROOT}/.swiftformat"
 
-echo $swift_files | xargs git add
+$SWIFT_FORMAT --version 1>/dev/null 2>&1
+if [ $? -eq 0 ]
+then
+    $GIT_FORMAT_STAGED --formatter "$SWIFT_FORMAT stdin --config "$CONFIG" --stdinpath '{}'" "*.swift"
+fi
diff --git a/Package.resolved b/Package.resolved
index 8d4aa0788..e4806c58d 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -81,15 +81,6 @@
         "version" : "600.0.1"
       }
     },
-    {
-      "identity" : "swiftformat",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/nicklockwood/SwiftFormat",
-      "state" : {
-        "revision" : "dd989a46d0c6f15c016484bab8afe5e7a67a4022",
-        "version" : "0.54.0"
-      }
-    },
     {
       "identity" : "xctest-dynamic-overlay",
       "kind" : "remoteSourceControl",
diff --git a/Package.swift b/Package.swift
index e6af4c440..3d9d18c3d 100644
--- a/Package.swift
+++ b/Package.swift
@@ -59,8 +59,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "7.1.1"),
         .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.6.0"),
-        .package(url: "https://github.com/nicklockwood/SwiftFormat", exact: "0.54.0"),
-        .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"601.0.0-prerelease"),
+        .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0" ..< "601.0.0-prerelease"),
         .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.1.0"),
         .package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "1.0.0"),
         .package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.4.0"),
@@ -278,7 +277,7 @@ extension PackageDescription.Product {
 }
 
 for target in package.targets {
-  var settings = target.swiftSettings ?? []
-  settings.append(.enableExperimentalFeature("StrictConcurrency=targeted"))
-  target.swiftSettings = settings
+    var settings = target.swiftSettings ?? []
+    settings.append(.enableExperimentalFeature("StrictConcurrency=targeted"))
+    target.swiftSettings = settings
 }
diff --git a/Samples/AlertContainer/Sources/AlertContainerScreen.swift b/Samples/AlertContainer/Sources/AlertContainerScreen.swift
index dc84afe0d..3a095a6e9 100644
--- a/Samples/AlertContainer/Sources/AlertContainerScreen.swift
+++ b/Samples/AlertContainer/Sources/AlertContainerScreen.swift
@@ -30,7 +30,7 @@ public struct AlertContainerScreen<BaseScreen: Screen>: Screen {
     }
 
     public func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return AlertContainerViewController.description(for: self, environment: environment)
+        AlertContainerViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/AlertContainer/Sources/AlertContainerViewController.swift b/Samples/AlertContainer/Sources/AlertContainerViewController.swift
index 1a6011787..a864f540f 100644
--- a/Samples/AlertContainer/Sources/AlertContainerViewController.swift
+++ b/Samples/AlertContainer/Sources/AlertContainerViewController.swift
@@ -18,13 +18,13 @@ import UIKit
 import Workflow
 import WorkflowUI
 
-private struct AlertStyleConstants {
+private enum AlertStyleConstants {
     static let viewWidth: CGFloat = 343.0
     static let buttonTitleColor = UIColor(red: 41 / 255, green: 150 / 255, blue: 204 / 255, alpha: 1.0)
     static let titleFont = UIFont.systemFont(ofSize: 18, weight: .medium)
 }
 
-internal final class AlertContainerViewController<AlertScreen: Screen>: ScreenViewController<AlertContainerScreen<AlertScreen>> {
+final class AlertContainerViewController<AlertScreen: Screen>: ScreenViewController<AlertContainerScreen<AlertScreen>> {
     private var baseScreenViewController: DescribedViewController
 
     private let dimmingView = UIView()
@@ -63,7 +63,7 @@ internal final class AlertContainerViewController<AlertScreen: Screen>: ScreenVi
         baseScreenViewController.update(screen: screen.baseScreen, environment: environment)
 
         if let alert = screen.alert {
-            if let alertView = alertView {
+            if let alertView {
                 alertView.alert = alert
             } else {
                 let inAlertView = AlertView(alert: alert)
@@ -104,7 +104,7 @@ internal final class AlertContainerViewController<AlertScreen: Screen>: ScreenVi
                 )
             }
         } else {
-            if let alertView = alertView {
+            if let alertView {
                 UIView.animate(
                     withDuration: 0.1,
                     delay: 0,
@@ -126,23 +126,23 @@ internal final class AlertContainerViewController<AlertScreen: Screen>: ScreenVi
     }
 
     override var childForStatusBarStyle: UIViewController? {
-        return baseScreenViewController
+        baseScreenViewController
     }
 
     override var childForStatusBarHidden: UIViewController? {
-        return baseScreenViewController
+        baseScreenViewController
     }
 
     override var childForHomeIndicatorAutoHidden: UIViewController? {
-        return baseScreenViewController
+        baseScreenViewController
     }
 
     override var childForScreenEdgesDeferringSystemGestures: UIViewController? {
-        return baseScreenViewController
+        baseScreenViewController
     }
 
     override public var supportedInterfaceOrientations: UIInterfaceOrientationMask {
-        return baseScreenViewController.supportedInterfaceOrientations
+        baseScreenViewController.supportedInterfaceOrientations
     }
 }
 
@@ -173,7 +173,7 @@ private final class AlertView: UIView {
     }
 
     private func commonInit() {
-        guard let alert = alert else {
+        guard let alert else {
             return
         }
         title.text = alert.title
@@ -253,6 +253,7 @@ private final class AlertButton: UIButton {
         addTarget(self, action: #selector(triggerActionHandler), for: .touchUpInside)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/Samples/AsyncWorker/Sources/AsyncWorkerWorkflow.swift b/Samples/AsyncWorker/Sources/AsyncWorkerWorkflow.swift
index 9bb62d667..a90fcb726 100644
--- a/Samples/AsyncWorker/Sources/AsyncWorkerWorkflow.swift
+++ b/Samples/AsyncWorker/Sources/AsyncWorkerWorkflow.swift
@@ -22,7 +22,7 @@ extension AsyncWorkerWorkflow {
     }
 
     func makeInitialState() -> AsyncWorkerWorkflow.State {
-        return State(model: Model(message: "Initial State"))
+        State(model: Model(message: "Initial State"))
     }
 
     func workflowDidChange(from previousWorkflow: AsyncWorkerWorkflow, state: inout State) {}
diff --git a/Samples/AsyncWorker/Sources/FakeNetwork/FakeNetworkManager.swift b/Samples/AsyncWorker/Sources/FakeNetwork/FakeNetworkManager.swift
index 60669614b..b6a40b1c1 100644
--- a/Samples/AsyncWorker/Sources/FakeNetwork/FakeNetworkManager.swift
+++ b/Samples/AsyncWorker/Sources/FakeNetwork/FakeNetworkManager.swift
@@ -9,7 +9,7 @@ import Foundation
 
 class FakeNetworkManager {
     static func makeFakeNetworkRequest() -> FakeRequest {
-        return FakeRequest()
+        FakeRequest()
     }
 }
 
diff --git a/Samples/AsyncWorker/Sources/FakeNetwork/Model.swift b/Samples/AsyncWorker/Sources/FakeNetwork/Model.swift
index 833347a08..01bdb42f5 100644
--- a/Samples/AsyncWorker/Sources/FakeNetwork/Model.swift
+++ b/Samples/AsyncWorker/Sources/FakeNetwork/Model.swift
@@ -1,5 +1,5 @@
 //
-//  FakeModel.swift
+//  Model.swift
 //  AsyncWorker
 //
 //  Created by Mark Johnson on 6/16/22.
diff --git a/Samples/BackStackContainer/Sources/BackStackContainer.swift b/Samples/BackStackContainer/Sources/BackStackContainer.swift
index 6293d0b72..89abfc48c 100644
--- a/Samples/BackStackContainer/Sources/BackStackContainer.swift
+++ b/Samples/BackStackContainer/Sources/BackStackContainer.swift
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import WorkflowUI
 import UIKit
+import WorkflowUI
 
 public final class BackStackContainer<Content: Screen>: ScreenViewController<BackStackScreen<Content>>, UINavigationControllerDelegate {
     private let navController = UINavigationController()
@@ -69,14 +69,12 @@ public final class BackStackContainer<Content: Screen>: ScreenViewController<Bac
             return
         }
 
-        let hidden: Bool
-
-        switch topScreen.barVisibility {
+        let hidden = switch topScreen.barVisibility {
         case .hidden:
-            hidden = true
+            true
 
         case .visible:
-            hidden = false
+            false
         }
         navController.setNavigationBarHidden(hidden, animated: animated)
     }
diff --git a/Samples/BackStackContainer/Sources/BackStackScreen.swift b/Samples/BackStackContainer/Sources/BackStackScreen.swift
index fd2a56788..333e87986 100644
--- a/Samples/BackStackContainer/Sources/BackStackScreen.swift
+++ b/Samples/BackStackContainer/Sources/BackStackScreen.swift
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import WorkflowUI
 import UIKit
+import WorkflowUI
 
 public struct BackStackScreen<ScreenType: Screen>: Screen {
     var items: [Item]
@@ -25,7 +25,7 @@ public struct BackStackScreen<ScreenType: Screen>: Screen {
     }
 
     public func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return BackStackContainer.description(for: self, environment: environment)
+        BackStackContainer.description(for: self, environment: environment)
     }
 }
 
@@ -36,10 +36,10 @@ extension BackStackScreen {
         public var screen: ScreenType
         public var barVisibility: BarVisibility
 
-        public init<Key: Hashable>(key: Key?, screen: ScreenType, barVisibility: BarVisibility) {
+        public init(key: (some Hashable)?, screen: ScreenType, barVisibility: BarVisibility) {
             self.screen = screen
 
-            if let key = key {
+            if let key {
                 self.key = AnyHashable(key)
             } else {
                 self.key = AnyHashable(ObjectIdentifier(ScreenType.self))
@@ -52,7 +52,7 @@ extension BackStackScreen {
             self.init(key: key, screen: screen, barVisibility: barVisibility)
         }
 
-        public init<Key: Hashable>(key: Key?, screen: ScreenType, barContent: BackStackScreen.BarContent) {
+        public init(key: (some Hashable)?, screen: ScreenType, barContent: BackStackScreen.BarContent) {
             self.init(key: key, screen: screen, barVisibility: .visible(barContent))
         }
 
@@ -61,7 +61,7 @@ extension BackStackScreen {
             self.init(key: key, screen: screen, barContent: barContent)
         }
 
-        public init<Key: Hashable>(key: Key?, screen: ScreenType) {
+        public init(key: (some Hashable)?, screen: ScreenType) {
             let barVisibility: BarVisibility = .visible(BarContent())
             self.init(key: key, screen: screen, barVisibility: barVisibility)
         }
@@ -125,7 +125,7 @@ extension BackStackScreen.BarContent {
 
         /// Convenience factory for a default back button.
         public static func back(handler: @escaping () -> Void) -> Button {
-            return Button(content: .text("Back"), handler: handler)
+            Button(content: .text("Back"), handler: handler)
         }
     }
 }
diff --git a/Samples/BackStackContainer/Sources/ScreenWrapperViewController.swift b/Samples/BackStackContainer/Sources/ScreenWrapperViewController.swift
index 1926680c9..f802040f8 100644
--- a/Samples/BackStackContainer/Sources/ScreenWrapperViewController.swift
+++ b/Samples/BackStackContainer/Sources/ScreenWrapperViewController.swift
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import WorkflowUI
 import UIKit
+import WorkflowUI
 
 /**
  Wrapper view controller for being hosted in a backstack. Handles updating the bar button items.
@@ -58,7 +58,7 @@ final class ScreenWrapperViewController<ScreenType: Screen>: UIViewController {
     }
 
     func matches(item: BackStackScreen<ScreenType>.Item) -> Bool {
-        return item.key == key
+        item.key == key
             && type(of: item.screen) == ScreenType.self
     }
 
@@ -97,16 +97,16 @@ final class ScreenWrapperViewController<ScreenType: Screen>: UIViewController {
             }
         }
 
-        let title: String
-        switch barContent.title {
+        let title: String = switch barContent.title {
         case .none:
-            title = ""
+            ""
         case .text(let text):
-            title = text
+            text
         }
         navigationItem.title = title
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -127,6 +127,7 @@ extension ScreenWrapperViewController {
             update(with: button)
         }
 
+        @available(*, unavailable)
         required init?(coder aDecoder: NSCoder) {
             fatalError("init(coder:) has not been implemented")
         }
diff --git a/Samples/ModalContainer/Sources/ModalContainerScreen.swift b/Samples/ModalContainer/Sources/ModalContainerScreen.swift
index 22a7c5fee..392567cff 100644
--- a/Samples/ModalContainer/Sources/ModalContainerScreen.swift
+++ b/Samples/ModalContainer/Sources/ModalContainerScreen.swift
@@ -30,7 +30,7 @@ public struct ModalContainerScreen<BaseScreen: Screen>: Screen {
     }
 
     public func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return ModalContainerViewController.description(for: self, environment: environment)
+        ModalContainerViewController.description(for: self, environment: environment)
     }
 }
 
@@ -55,7 +55,7 @@ public struct ModalContainerScreenModal {
     /// A key used to differentiate modal screens during updates
     public var key: AnyHashable
 
-    public init<Key: Hashable>(screen: AnyScreen, style: Style = .fullScreen, key: Key, animated: Bool = true) {
+    public init(screen: AnyScreen, style: Style = .fullScreen, key: some Hashable, animated: Bool = true) {
         self.screen = screen
         self.style = style
         self.key = AnyHashable(key)
diff --git a/Samples/ModalContainer/Sources/ModalContainerViewController.swift b/Samples/ModalContainer/Sources/ModalContainerViewController.swift
index 0a5e3fb2c..b2c682dbe 100644
--- a/Samples/ModalContainer/Sources/ModalContainerViewController.swift
+++ b/Samples/ModalContainer/Sources/ModalContainerViewController.swift
@@ -19,16 +19,16 @@ import Workflow
 import WorkflowUI
 
 /// Container for showing workflow screens modally over a base screen.
-internal final class ModalContainerViewController<ModalScreen: Screen>: ScreenViewController<ModalContainerScreen<ModalScreen>> {
+final class ModalContainerViewController<ModalScreen: Screen>: ScreenViewController<ModalContainerScreen<ModalScreen>> {
     var baseScreenViewController: DescribedViewController
 
     private var presentedScreens: [ModallyPresentedScreen] = []
 
     private var topmostScreenViewController: DescribedViewController? {
         if let topModal = presentedScreens.last {
-            return topModal.viewController
+            topModal.viewController
         } else {
-            return baseScreenViewController
+            baseScreenViewController
         }
     }
 
@@ -184,31 +184,31 @@ internal final class ModalContainerViewController<ModalScreen: Screen>: ScreenVi
         super.viewDidLayoutSubviews()
         baseScreenViewController.view.frame = view.bounds
 
-        presentedScreens.forEach {
-            let displayInfo = ModalDisplayInfo(containerSize: view.bounds.size, style: $0.style, animated: $0.animated)
-            $0.viewController.view.frame = displayInfo.frame
-            $0.dimmingView?.frame = view.bounds
+        for presentedScreen in presentedScreens {
+            let displayInfo = ModalDisplayInfo(containerSize: view.bounds.size, style: presentedScreen.style, animated: presentedScreen.animated)
+            presentedScreen.viewController.view.frame = displayInfo.frame
+            presentedScreen.dimmingView?.frame = view.bounds
         }
     }
 
     override var childForStatusBarStyle: UIViewController? {
-        return topmostScreenViewController
+        topmostScreenViewController
     }
 
     override var childForStatusBarHidden: UIViewController? {
-        return topmostScreenViewController
+        topmostScreenViewController
     }
 
     override var childForHomeIndicatorAutoHidden: UIViewController? {
-        return topmostScreenViewController
+        topmostScreenViewController
     }
 
     override var childForScreenEdgesDeferringSystemGestures: UIViewController? {
-        return topmostScreenViewController
+        topmostScreenViewController
     }
 
     override public var supportedInterfaceOrientations: UIInterfaceOrientationMask {
-        return topmostScreenViewController?.supportedInterfaceOrientations ?? super.supportedInterfaceOrientations
+        topmostScreenViewController?.supportedInterfaceOrientations ?? super.supportedInterfaceOrientations
     }
 }
 
@@ -220,7 +220,7 @@ private struct ModallyPresentedScreen {
     var animated: Bool
 
     var identifier: ModalIdentifier {
-        return ModalIdentifier(
+        ModalIdentifier(
             style: style,
             key: key,
             animated: animated
@@ -230,7 +230,7 @@ private struct ModallyPresentedScreen {
 
 extension ModalContainerScreenModal {
     fileprivate var identifier: ModalIdentifier {
-        return ModalIdentifier(
+        ModalIdentifier(
             style: style,
             key: key,
             animated: animated
@@ -259,36 +259,36 @@ private struct ModalDisplayInfo {
 
     init(containerSize: CGSize, style: ModalContainerScreenModal.Style, animated: Bool) {
         // Configure all properties so that they default to fullScreen/sheet animation.
-        frame = CGRect(origin: .zero, size: containerSize)
-        alpha = 1.0
-        transform = .identity
-        incomingInitialFrame = CGRect(
+        self.frame = CGRect(origin: .zero, size: containerSize)
+        self.alpha = 1.0
+        self.transform = .identity
+        self.incomingInitialFrame = CGRect(
             x: frame.origin.x,
             y: containerSize.height,
             width: frame.size.width,
             height: frame.size.height
         )
-        outgoingFinalFrame = CGRect(
+        self.outgoingFinalFrame = CGRect(
             x: frame.origin.x,
             y: containerSize.height,
             width: frame.size.width,
             height: frame.size.height
         )
-        incomingInitialTransform = .identity
-        outgoingFinalTransform = .identity
-        incomingInitialAlpha = 1.0
-        outgoingFinalAlpha = 1.0
-        duration = 0.5
-        animationOptions = UIView.AnimationOptions(rawValue: 7 << 16)
+        self.incomingInitialTransform = .identity
+        self.outgoingFinalTransform = .identity
+        self.incomingInitialAlpha = 1.0
+        self.outgoingFinalAlpha = 1.0
+        self.duration = 0.5
+        self.animationOptions = UIView.AnimationOptions(rawValue: 7 << 16)
 
         switch style {
         case .fullScreen:
             // Clear the default fullscreen animation configuration.
             if !animated {
-                duration = 0
-                animationOptions = UIView.AnimationOptions(rawValue: 0)
-                incomingInitialFrame = frame
-                outgoingFinalFrame = frame
+                self.duration = 0
+                self.animationOptions = UIView.AnimationOptions(rawValue: 0)
+                self.incomingInitialFrame = frame
+                self.outgoingFinalFrame = frame
             }
         case .sheet:
             if UIDevice.current.userInterfaceIdiom == .phone {
@@ -303,20 +303,20 @@ private struct ModalDisplayInfo {
                 y: (containerSize.height - popoverSideLength) / 2
             )
 
-            frame = CGRect(origin: popOverOrigin, size: popoverSize)
+            self.frame = CGRect(origin: popOverOrigin, size: popoverSize)
 
-            duration = 0.1
-            animationOptions = UIView.AnimationOptions(rawValue: 0)
+            self.duration = 0.1
+            self.animationOptions = UIView.AnimationOptions(rawValue: 0)
 
             // Do not animate frame.
-            incomingInitialFrame = frame
-            outgoingFinalFrame = frame
+            self.incomingInitialFrame = frame
+            self.outgoingFinalFrame = frame
 
             // Animate transform and alpha.
-            incomingInitialTransform = CGAffineTransform(scaleX: 0.85, y: 0.85)
-            outgoingFinalTransform = CGAffineTransform(scaleX: 0.85, y: 0.85)
-            incomingInitialAlpha = 0.0
-            outgoingFinalAlpha = 0.0
+            self.incomingInitialTransform = CGAffineTransform(scaleX: 0.85, y: 0.85)
+            self.outgoingFinalTransform = CGAffineTransform(scaleX: 0.85, y: 0.85)
+            self.incomingInitialAlpha = 0.0
+            self.outgoingFinalAlpha = 0.0
         }
     }
 }
diff --git a/Samples/ObservableScreen/Sources/CounterWorkflow.swift b/Samples/ObservableScreen/Sources/CounterWorkflow.swift
index 759f901a9..d38ddde76 100644
--- a/Samples/ObservableScreen/Sources/CounterWorkflow.swift
+++ b/Samples/ObservableScreen/Sources/CounterWorkflow.swift
@@ -13,7 +13,7 @@ struct CounterWorkflow: Workflow {
     @ObservableState
     struct State {
         private var _count: Int
-        
+
         var count: Int {
             get { _count }
             set {
@@ -35,7 +35,7 @@ struct CounterWorkflow: Workflow {
         }
 
         var info: CounterInfo
-        
+
         init(count: Int, maxValue: Int? = nil, info: CounterInfo) {
             self._count = count
             self.maxValue = maxValue
diff --git a/Samples/Project.swift b/Samples/Project.swift
index 625dce257..9ef3f5826 100644
--- a/Samples/Project.swift
+++ b/Samples/Project.swift
@@ -40,7 +40,6 @@ let project = Project(
     name: "Development",
     settings: .settings(base: ["ENABLE_MODULE_VERIFIER": "YES"]),
     targets: [
-        
         // MARK: - Samples
 
         .target(
@@ -72,13 +71,13 @@ let project = Project(
             sources: "ObservableScreen/Sources/**",
             dependencies: [.external(name: "WorkflowSwiftUI")]
         ),
-        
+
         .app(
             name: "SampleApp",
             sources: "SampleApp/Sources/**",
             dependencies: [.external(name: "WorkflowUI")]
         ),
-        
+
         .target(
             name: "SplitScreenContainer",
             dependencies: [.external(name: "WorkflowUI")]
@@ -95,7 +94,7 @@ let project = Project(
                 .external(name: "iOSSnapshotTestCase"),
             ]
         ),
-        
+
         .app(
             name: "TicTacToe",
             sources: "TicTacToe/Sources/**",
@@ -130,7 +129,7 @@ let project = Project(
                 .external(name: "WorkflowTesting"),
             ]
         ),
-        
+
         // MARK: - Workflow Tests
 
         // Some of these tests are duplicates of the test definitions in the root Package.swift, but Tuist
@@ -245,7 +244,7 @@ let project = Project(
                 .external(name: "WorkflowReactiveSwift"),
                 .target(name: "TestAppHost"),
             ]
-        )
+        ),
     ],
     schemes: [
         .scheme(
diff --git a/Samples/SampleApp/Sources/AppDelegate.swift b/Samples/SampleApp/Sources/AppDelegate.swift
index c6ea76c77..862dff91d 100644
--- a/Samples/SampleApp/Sources/AppDelegate.swift
+++ b/Samples/SampleApp/Sources/AppDelegate.swift
@@ -17,7 +17,7 @@
 import UIKit
 import WorkflowUI
 
-@UIApplicationMain
+@main
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
diff --git a/Samples/SampleApp/Sources/CrossFadeContainer.swift b/Samples/SampleApp/Sources/CrossFadeContainer.swift
index 2c2bd4827..1042708ba 100644
--- a/Samples/SampleApp/Sources/CrossFadeContainer.swift
+++ b/Samples/SampleApp/Sources/CrossFadeContainer.swift
@@ -14,34 +14,34 @@
  * limitations under the License.
  */
 
+import UIKit
 import Workflow
 import WorkflowUI
-import UIKit
 
 struct CrossFadeScreen: Screen {
     var baseScreen: AnyScreen
     var key: AnyHashable
 
-    init<ScreenType: Screen, Key: Hashable>(base screen: ScreenType, key: Key?) {
+    init<ScreenType: Screen>(base screen: ScreenType, key: (some Hashable)?) {
         self.baseScreen = AnyScreen(screen)
-        if let key = key {
+        if let key {
             self.key = AnyHashable(key)
         } else {
             self.key = AnyHashable(ObjectIdentifier(ScreenType.self))
         }
     }
 
-    init<ScreenType: Screen>(base screen: ScreenType) {
+    init(base screen: some Screen) {
         let key = Optional<AnyHashable>.none
         self.init(base: screen, key: key)
     }
 
     fileprivate func isEquivalent(to otherScreen: CrossFadeScreen) -> Bool {
-        return key == otherScreen.key
+        key == otherScreen.key
     }
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return CrossFadeContainerViewController.description(for: self, environment: environment)
+        CrossFadeContainerViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/SampleApp/Sources/DemoScreen.swift b/Samples/SampleApp/Sources/DemoScreen.swift
index 3f27822a4..f8d91ed97 100644
--- a/Samples/SampleApp/Sources/DemoScreen.swift
+++ b/Samples/SampleApp/Sources/DemoScreen.swift
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+import UIKit
 import Workflow
 import WorkflowUI
-import UIKit
 
 struct DemoScreen: Screen {
     let title: String
@@ -31,7 +31,7 @@ struct DemoScreen: Screen {
     let onRefreshTap: () -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return DemoViewController.description(for: self, environment: environment)
+        DemoViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/SampleApp/Sources/DemoWorkflow.swift b/Samples/SampleApp/Sources/DemoWorkflow.swift
index 334cb3618..f32806927 100644
--- a/Samples/SampleApp/Sources/DemoWorkflow.swift
+++ b/Samples/SampleApp/Sources/DemoWorkflow.swift
@@ -15,10 +15,10 @@
  */
 
 import ReactiveSwift
+import UIKit
 import Workflow
 import WorkflowReactiveSwift
 import WorkflowUI
-import UIKit
 
 // MARK: Input and Output
 
@@ -55,7 +55,7 @@ extension DemoWorkflow {
     }
 
     func makeInitialState() -> DemoWorkflow.State {
-        return State(
+        State(
             signal: TimerSignal(),
             colorState: .red,
             loadingState: .idle(title: "Not Loaded"),
@@ -98,8 +98,10 @@ extension DemoWorkflow {
 
             case .refreshButtonTapped:
                 state.loadingState = .loading
+
             case .refreshComplete(let message):
                 state.loadingState = .idle(title: message)
+
             case .refreshError(let error):
                 state.loadingState = .idle(title: error.localizedDescription)
             }
@@ -117,12 +119,12 @@ struct RefreshWorker: Worker {
     }
 
     func run() -> SignalProducer<RefreshWorker.Output, Never> {
-        return SignalProducer(value: .success("We did it!"))
+        SignalProducer(value: .success("We did it!"))
             .delay(1.0, on: QueueScheduler.main)
     }
 
     func isEquivalent(to otherWorker: RefreshWorker) -> Bool {
-        return true
+        true
     }
 }
 
@@ -132,14 +134,13 @@ extension DemoWorkflow {
     typealias Rendering = DemoScreen
 
     func render(state: DemoWorkflow.State, context: RenderContext<DemoWorkflow>) -> Rendering {
-        let color: UIColor
-        switch state.colorState {
+        let color: UIColor = switch state.colorState {
         case .red:
-            color = .red
+            .red
         case .green:
-            color = .green
+            .green
         case .blue:
-            color = .blue
+            .blue
         }
 
         var title = "Hello, \(name)!"
diff --git a/Samples/SampleApp/Sources/ReversingWorkflow.swift b/Samples/SampleApp/Sources/ReversingWorkflow.swift
index 754dfd63c..e57f99529 100644
--- a/Samples/SampleApp/Sources/ReversingWorkflow.swift
+++ b/Samples/SampleApp/Sources/ReversingWorkflow.swift
@@ -32,6 +32,6 @@ struct ReversingWorkflow: Workflow {
 
 extension ReversingWorkflow {
     func render(state: ReversingWorkflow.State, context: RenderContext<ReversingWorkflow>) -> String {
-        return String(text.reversed())
+        String(text.reversed())
     }
 }
diff --git a/Samples/SampleApp/Sources/RootWorkflow.swift b/Samples/SampleApp/Sources/RootWorkflow.swift
index 21b12602c..a0e117c22 100644
--- a/Samples/SampleApp/Sources/RootWorkflow.swift
+++ b/Samples/SampleApp/Sources/RootWorkflow.swift
@@ -33,7 +33,7 @@ extension RootWorkflow {
     }
 
     func makeInitialState() -> RootWorkflow.State {
-        return .welcome
+        .welcome
     }
 }
 
@@ -64,7 +64,7 @@ extension RootWorkflow {
     func render(state: RootWorkflow.State, context: RenderContext<RootWorkflow>) -> Rendering {
         switch state {
         case .welcome:
-            return CrossFadeScreen(
+            CrossFadeScreen(
                 base: WelcomeWorkflow()
                     .mapOutput { output -> Action in
                         switch output {
@@ -76,7 +76,7 @@ extension RootWorkflow {
             )
 
         case .demo(name: let name):
-            return CrossFadeScreen(
+            CrossFadeScreen(
                 base: DemoWorkflow(name: name)
                     .rendered(in: context)
             )
diff --git a/Samples/SampleApp/Sources/WelcomeScreen.swift b/Samples/SampleApp/Sources/WelcomeScreen.swift
index 8ce5bd2d5..3f524d150 100644
--- a/Samples/SampleApp/Sources/WelcomeScreen.swift
+++ b/Samples/SampleApp/Sources/WelcomeScreen.swift
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+import UIKit
 import Workflow
 import WorkflowUI
-import UIKit
 
 struct WelcomeScreen: Screen {
     var name: String
@@ -24,7 +24,7 @@ struct WelcomeScreen: Screen {
     var onLoginTapped: () -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return WelcomeViewController.description(for: self, environment: environment)
+        WelcomeViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/SampleApp/Sources/WelcomeWorkflow.swift b/Samples/SampleApp/Sources/WelcomeWorkflow.swift
index a80a2f7ef..99505066a 100644
--- a/Samples/SampleApp/Sources/WelcomeWorkflow.swift
+++ b/Samples/SampleApp/Sources/WelcomeWorkflow.swift
@@ -33,7 +33,7 @@ extension WelcomeWorkflow {
     }
 
     func makeInitialState() -> WelcomeWorkflow.State {
-        return State(name: "")
+        State(name: "")
     }
 }
 
diff --git a/Samples/SplitScreenContainer/DemoApp/AppDelegate.swift b/Samples/SplitScreenContainer/DemoApp/AppDelegate.swift
index 433271acb..174c407fa 100644
--- a/Samples/SplitScreenContainer/DemoApp/AppDelegate.swift
+++ b/Samples/SplitScreenContainer/DemoApp/AppDelegate.swift
@@ -19,7 +19,7 @@ import UIKit
 import Workflow
 import WorkflowUI
 
-@UIApplicationMain
+@main
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
diff --git a/Samples/SplitScreenContainer/DemoApp/BarScreen.swift b/Samples/SplitScreenContainer/DemoApp/BarScreen.swift
index ffce613cf..f47dc6924 100644
--- a/Samples/SplitScreenContainer/DemoApp/BarScreen.swift
+++ b/Samples/SplitScreenContainer/DemoApp/BarScreen.swift
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+import UIKit
 import Workflow
 import WorkflowUI
-import UIKit
 
 struct BarScreen: Screen {
     let title: String
@@ -24,7 +24,7 @@ struct BarScreen: Screen {
     let viewTapped: () -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return BarScreenViewController.description(for: self, environment: environment)
+        BarScreenViewController.description(for: self, environment: environment)
     }
 }
 
@@ -64,7 +64,7 @@ private final class BarScreenViewController: ScreenViewController<BarScreen> {
         let newGradientLayer = CAGradientLayer()
 
         newGradientLayer.frame = targetView.bounds
-        newGradientLayer.colors = colors.map { $0.cgColor }
+        newGradientLayer.colors = colors.map(\.cgColor)
 
         targetView.layer.insertSublayer(newGradientLayer, at: 0)
 
diff --git a/Samples/SplitScreenContainer/DemoApp/DemoWorkflow.swift b/Samples/SplitScreenContainer/DemoApp/DemoWorkflow.swift
index a3f757fea..5fd49fe6f 100644
--- a/Samples/SplitScreenContainer/DemoApp/DemoWorkflow.swift
+++ b/Samples/SplitScreenContainer/DemoApp/DemoWorkflow.swift
@@ -15,9 +15,9 @@
  */
 
 import SplitScreenContainer
+import UIKit
 import Workflow
 import WorkflowUI
-import UIKit
 
 // MARK: Input and Output
 
@@ -31,7 +31,7 @@ extension DemoWorkflow {
     typealias State = Int
 
     func makeInitialState() -> State {
-        return 1
+        1
     }
 }
 
diff --git a/Samples/SplitScreenContainer/DemoApp/FooScreen.swift b/Samples/SplitScreenContainer/DemoApp/FooScreen.swift
index 228167d77..a06285d15 100644
--- a/Samples/SplitScreenContainer/DemoApp/FooScreen.swift
+++ b/Samples/SplitScreenContainer/DemoApp/FooScreen.swift
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+import UIKit
 import Workflow
 import WorkflowUI
-import UIKit
 
 struct FooScreen: Screen {
     let title: String
@@ -24,7 +24,7 @@ struct FooScreen: Screen {
     let viewTapped: () -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return FooScreenViewController.description(for: self, environment: environment)
+        FooScreenViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/SplitScreenContainer/SnapshotTests/SplitScreenContainerScreenSnapshotTests.swift b/Samples/SplitScreenContainer/SnapshotTests/SplitScreenContainerScreenSnapshotTests.swift
index 06761eb68..f27cb06ed 100644
--- a/Samples/SplitScreenContainer/SnapshotTests/SplitScreenContainerScreenSnapshotTests.swift
+++ b/Samples/SplitScreenContainer/SnapshotTests/SplitScreenContainerScreenSnapshotTests.swift
@@ -60,7 +60,7 @@ private struct FooScreen: Screen {
     let viewTapped: () -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return FooScreenViewController.description(for: self, environment: environment)
+        FooScreenViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/SplitScreenContainer/Sources/ContainerView.swift b/Samples/SplitScreenContainer/Sources/ContainerView.swift
index 85a0f1338..b95d71ba7 100644
--- a/Samples/SplitScreenContainer/Sources/ContainerView.swift
+++ b/Samples/SplitScreenContainer/Sources/ContainerView.swift
@@ -16,7 +16,7 @@
 
 import UIKit
 
-internal class ContainerView: UIView {
+class ContainerView: UIView {
     var contentView: UIView = .init()
 
     override init(frame: CGRect) {
diff --git a/Samples/SplitScreenContainer/Sources/Environment+SplitScreen.swift b/Samples/SplitScreenContainer/Sources/Environment+SplitScreen.swift
index 26d79420f..f2ec01514 100644
--- a/Samples/SplitScreenContainer/Sources/Environment+SplitScreen.swift
+++ b/Samples/SplitScreenContainer/Sources/Environment+SplitScreen.swift
@@ -29,7 +29,7 @@ public enum SplitScreenPosition {
 
 extension ViewEnvironment {
     public internal(set) var splitScreenPosition: SplitScreenPosition {
-        get { return self[SplitScreenPositionKey.self] }
+        get { self[SplitScreenPositionKey.self] }
         set { self[SplitScreenPositionKey.self] = newValue }
     }
 }
diff --git a/Samples/SplitScreenContainer/Sources/SplitScreenContainerScreen.swift b/Samples/SplitScreenContainer/Sources/SplitScreenContainerScreen.swift
index 2617790b9..b82ef8e3c 100644
--- a/Samples/SplitScreenContainer/Sources/SplitScreenContainerScreen.swift
+++ b/Samples/SplitScreenContainer/Sources/SplitScreenContainerScreen.swift
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import WorkflowUI
 import UIKit
+import WorkflowUI
 
 /// A `SplitScreenContainerScreen` displays two screens side by side with a separator in between.
 public struct SplitScreenContainerScreen<LeadingScreenType: Screen, TrailingScreenType: Screen>: Screen {
@@ -49,12 +49,12 @@ public struct SplitScreenContainerScreen<LeadingScreenType: Screen, TrailingScre
     }
 
     public func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return SplitScreenContainerViewController.description(for: self, environment: environment)
+        SplitScreenContainerViewController.description(for: self, environment: environment)
     }
 }
 
-public extension CGFloat {
-    static let quarter: CGFloat = 1.0 / 4.0
-    static let third: CGFloat = 1.0 / 3.0
-    static let half: CGFloat = 1.0 / 2.0
+extension CGFloat {
+    public static let quarter: CGFloat = 1.0 / 4.0
+    public static let third: CGFloat = 1.0 / 3.0
+    public static let half: CGFloat = 1.0 / 2.0
 }
diff --git a/Samples/SplitScreenContainer/Sources/SplitScreenContainerViewController.swift b/Samples/SplitScreenContainer/Sources/SplitScreenContainerViewController.swift
index 424b2bcce..001387d0f 100644
--- a/Samples/SplitScreenContainer/Sources/SplitScreenContainerViewController.swift
+++ b/Samples/SplitScreenContainer/Sources/SplitScreenContainerViewController.swift
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
+import UIKit
 import Workflow
 import WorkflowUI
-import UIKit
 
-internal final class SplitScreenContainerViewController<LeadingScreenType: Screen, TrailingScreenType: Screen>: ScreenViewController<SplitScreenContainerViewController.ContainerScreen> {
-    internal typealias ContainerScreen = SplitScreenContainerScreen<LeadingScreenType, TrailingScreenType>
+final class SplitScreenContainerViewController<LeadingScreenType: Screen, TrailingScreenType: Screen>: ScreenViewController<SplitScreenContainerViewController.ContainerScreen> {
+    typealias ContainerScreen = SplitScreenContainerScreen<LeadingScreenType, TrailingScreenType>
 
     private var leadingContentViewController: DescribedViewController
     private lazy var leadingContainerView: ContainerView = .init()
@@ -45,7 +45,7 @@ internal final class SplitScreenContainerViewController<LeadingScreenType: Scree
         super.init(screen: screen, environment: environment)
     }
 
-    override internal func screenDidChange(from previousScreen: ContainerScreen, previousEnvironment: ViewEnvironment) {
+    override func screenDidChange(from previousScreen: ContainerScreen, previousEnvironment: ViewEnvironment) {
         super.screenDidChange(from: previousScreen, previousEnvironment: previousEnvironment)
 
         if screen.ratio != previousScreen.ratio {
@@ -84,7 +84,7 @@ internal final class SplitScreenContainerViewController<LeadingScreenType: Scree
         }
     }
 
-    override internal func viewDidLoad() {
+    override func viewDidLoad() {
         super.viewDidLoad()
 
         view.addSubview(leadingContainerView)
@@ -102,7 +102,7 @@ internal final class SplitScreenContainerViewController<LeadingScreenType: Scree
         update(with: screen)
     }
 
-    override internal func viewDidLayoutSubviews() {
+    override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
 
         let distance = view.bounds.width * screen.ratio
@@ -119,8 +119,8 @@ internal final class SplitScreenContainerViewController<LeadingScreenType: Scree
     }
 }
 
-private extension UIViewController {
-    var isLayoutDirectionRightToLeft: Bool {
-        return traitCollection.layoutDirection == .rightToLeft
+extension UIViewController {
+    fileprivate var isLayoutDirectionRightToLeft: Bool {
+        traitCollection.layoutDirection == .rightToLeft
     }
 }
diff --git a/Samples/TicTacToe/Sources/Authentication/AuthenticationService.swift b/Samples/TicTacToe/Sources/Authentication/AuthenticationService.swift
index e72ef8e28..16961a58b 100644
--- a/Samples/TicTacToe/Sources/Authentication/AuthenticationService.swift
+++ b/Samples/TicTacToe/Sources/Authentication/AuthenticationService.swift
@@ -26,36 +26,36 @@ final class AuthenticationService {
     func login(email: String, password: String) -> SignalProducer<AuthenticationResponse, AuthenticationError> {
         if password == "password" {
             if email.contains("2fa") {
-                return SignalProducer(value: AuthenticationResponse(
+                SignalProducer(value: AuthenticationResponse(
                     token: AuthenticationService.weakToken,
                     secondFactorRequired: true
                 ))
-                    .delay(AuthenticationService.delayMS, on: QueueScheduler.main)
+                .delay(AuthenticationService.delayMS, on: QueueScheduler.main)
             } else {
-                return SignalProducer(value: AuthenticationResponse(
+                SignalProducer(value: AuthenticationResponse(
                     token: AuthenticationService.realToken, secondFactorRequired: false
                 ))
-                    .delay(AuthenticationService.delayMS, on: QueueScheduler.main)
+                .delay(AuthenticationService.delayMS, on: QueueScheduler.main)
             }
         } else {
-            return SignalProducer(error: .invalidUserPassword)
+            SignalProducer(error: .invalidUserPassword)
                 .delay(AuthenticationService.delayMS, on: QueueScheduler.main)
         }
     }
 
     func secondFactor(token: String, secondFactor: String) -> SignalProducer<AuthenticationResponse, AuthenticationError> {
         if token != AuthenticationService.weakToken {
-            return SignalProducer(error: .invalidIntermediateToken)
+            SignalProducer(error: .invalidIntermediateToken)
                 .delay(AuthenticationService.delayMS, on: QueueScheduler.main)
         } else if secondFactor != AuthenticationService.secondFactor {
-            return SignalProducer(error: .invalidTwoFactor)
+            SignalProducer(error: .invalidTwoFactor)
                 .delay(AuthenticationService.delayMS, on: QueueScheduler.main)
         } else {
-            return SignalProducer(value: AuthenticationResponse(
+            SignalProducer(value: AuthenticationResponse(
                 token: AuthenticationService.realToken,
                 secondFactorRequired: false
             ))
-                .delay(AuthenticationService.delayMS, on: QueueScheduler.main)
+            .delay(AuthenticationService.delayMS, on: QueueScheduler.main)
         }
     }
 }
@@ -65,11 +65,11 @@ extension AuthenticationService {
         var localizedDescription: String {
             switch self {
             case .invalidUserPassword:
-                return "Unknown user or invalid password."
+                "Unknown user or invalid password."
             case .invalidTwoFactor:
-                return "Invalid second factor (try \(AuthenticationService.secondFactor))"
+                "Invalid second factor (try \(AuthenticationService.secondFactor))"
             case .invalidIntermediateToken:
-                return "404!! What happened to your token there bud?!?!"
+                "404!! What happened to your token there bud?!?!"
             }
         }
 
diff --git a/Samples/TicTacToe/Sources/Authentication/AuthenticationWorkflow.swift b/Samples/TicTacToe/Sources/Authentication/AuthenticationWorkflow.swift
index 643ec5c49..bbdcd896d 100644
--- a/Samples/TicTacToe/Sources/Authentication/AuthenticationWorkflow.swift
+++ b/Samples/TicTacToe/Sources/Authentication/AuthenticationWorkflow.swift
@@ -44,7 +44,7 @@ extension AuthenticationWorkflow {
     }
 
     func makeInitialState() -> AuthenticationWorkflow.State {
-        return .emailPassword
+        .emailPassword
     }
 }
 
@@ -92,6 +92,7 @@ extension AuthenticationWorkflow {
                 switch state {
                 case .authorizingEmailPassword:
                     state = .authenticationErrorAlert(error: error)
+
                 case .authorizingTwoFactor(twoFactorCode: _, intermediateSession: let intermediateSession):
                     state = .twoFactor(intermediateSession: intermediateSession, authenticationError: error)
 
@@ -115,7 +116,7 @@ extension AuthenticationWorkflow {
         var password: String
 
         func run() -> SignalProducer<Output, Never> {
-            return authenticationService
+            authenticationService
                 .login(email: email, password: password)
                 .map { response -> Action in
                     .authenticationSucceeded(response: response)
@@ -126,7 +127,7 @@ extension AuthenticationWorkflow {
         }
 
         func isEquivalent(to otherWorker: AuthorizingEmailPasswordWorker) -> Bool {
-            return email == otherWorker.email
+            email == otherWorker.email
                 && password == otherWorker.password
         }
     }
@@ -139,7 +140,7 @@ extension AuthenticationWorkflow {
         var twoFactorCode: String
 
         func run() -> SignalProducer<Output, Never> {
-            return authenticationService
+            authenticationService
                 .secondFactor(
                     token: intermediateToken,
                     secondFactor: twoFactorCode
@@ -153,7 +154,7 @@ extension AuthenticationWorkflow {
         }
 
         func isEquivalent(to otherWorker: AuthenticationWorkflow.AuthorizingTwoFactorWorker) -> Bool {
-            return intermediateToken == otherWorker.intermediateToken
+            intermediateToken == otherWorker.intermediateToken
                 && twoFactorCode == otherWorker.twoFactorCode
         }
     }
@@ -184,7 +185,7 @@ extension AuthenticationWorkflow {
             break
 
         case .authenticationErrorAlert(error: let error):
-            if let error = error {
+            if let error {
                 alert = Alert(
                     title: "Error",
                     message: error.localizedDescription,
@@ -235,11 +236,10 @@ extension AuthenticationWorkflow {
     }
 
     private func twoFactorScreen(error: AuthenticationService.AuthenticationError?, intermediateSession: String, sink: Sink<Action>) -> BackStackScreen<AnyScreen>.Item {
-        let title: String
-        if let authenticationError = error {
-            title = authenticationError.localizedDescription
+        let title: String = if let authenticationError = error {
+            authenticationError.localizedDescription
         } else {
-            title = "Enter the one time code to continue"
+            "Enter the one time code to continue"
         }
 
         let twoFactorScreen = TwoFactorScreen(
diff --git a/Samples/TicTacToe/Sources/Authentication/LoadingScreen.swift b/Samples/TicTacToe/Sources/Authentication/LoadingScreen.swift
index 9db1ed62d..f4281de97 100644
--- a/Samples/TicTacToe/Sources/Authentication/LoadingScreen.swift
+++ b/Samples/TicTacToe/Sources/Authentication/LoadingScreen.swift
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import WorkflowUI
 import UIKit
+import WorkflowUI
 
 struct LoadingScreen: Screen {
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return LoadingScreenViewController.description(for: self, environment: environment)
+        LoadingScreenViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/TicTacToe/Sources/Authentication/LoginScreen.swift b/Samples/TicTacToe/Sources/Authentication/LoginScreen.swift
index ef43b2d03..32d1daef4 100644
--- a/Samples/TicTacToe/Sources/Authentication/LoginScreen.swift
+++ b/Samples/TicTacToe/Sources/Authentication/LoginScreen.swift
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+import UIKit
 import Workflow
 import WorkflowUI
-import UIKit
 
 struct LoginScreen: Screen {
     var title: String
@@ -27,7 +27,7 @@ struct LoginScreen: Screen {
     var onLoginTapped: () -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return ViewControllerDescription(
+        ViewControllerDescription(
             environment: environment,
             build: { LoginViewController() },
             update: { $0.update(with: self) }
@@ -36,10 +36,10 @@ struct LoginScreen: Screen {
 }
 
 private final class LoginViewController: UIViewController {
-    private let welcomeLabel: UILabel = UILabel(frame: .zero)
-    private let emailField: UITextField = UITextField(frame: .zero)
-    private let passwordField: UITextField = UITextField(frame: .zero)
-    private let button: UIButton = UIButton(frame: .zero)
+    private let welcomeLabel: UILabel = .init(frame: .zero)
+    private let emailField: UITextField = .init(frame: .zero)
+    private let passwordField: UITextField = .init(frame: .zero)
+    private let button: UIButton = .init(frame: .zero)
     private var onEmailChanged: (String) -> Void = { _ in }
     private var onPasswordChanged: (String) -> Void = { _ in }
     private var onLoginTapped: () -> Void = {}
diff --git a/Samples/TicTacToe/Sources/Authentication/LoginWorkflow.swift b/Samples/TicTacToe/Sources/Authentication/LoginWorkflow.swift
index 29beafe7f..1fd4a083d 100644
--- a/Samples/TicTacToe/Sources/Authentication/LoginWorkflow.swift
+++ b/Samples/TicTacToe/Sources/Authentication/LoginWorkflow.swift
@@ -35,7 +35,7 @@ extension LoginWorkflow {
     }
 
     func makeInitialState() -> LoginWorkflow.State {
-        return State(email: "", password: "")
+        State(email: "", password: "")
     }
 }
 
diff --git a/Samples/TicTacToe/Sources/Authentication/TwoFactorScreen.swift b/Samples/TicTacToe/Sources/Authentication/TwoFactorScreen.swift
index 9e16a4d15..2f2aa8e47 100644
--- a/Samples/TicTacToe/Sources/Authentication/TwoFactorScreen.swift
+++ b/Samples/TicTacToe/Sources/Authentication/TwoFactorScreen.swift
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-import WorkflowUI
 import UIKit
+import WorkflowUI
 
 struct TwoFactorScreen: Screen {
     var title: String
     var onLoginTapped: (String) -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return TwoFactorViewController.description(for: self, environment: environment)
+        TwoFactorViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/TicTacToe/Sources/Game/ConfirmQuitScreen.swift b/Samples/TicTacToe/Sources/Game/ConfirmQuitScreen.swift
index 52a6328ef..ec9cc6a29 100644
--- a/Samples/TicTacToe/Sources/Game/ConfirmQuitScreen.swift
+++ b/Samples/TicTacToe/Sources/Game/ConfirmQuitScreen.swift
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+import UIKit
 import Workflow
 import WorkflowUI
-import UIKit
 
 struct ConfirmQuitScreen: Screen {
     let question: String
@@ -24,14 +24,14 @@ struct ConfirmQuitScreen: Screen {
     var onCancelTapped: () -> Void = {}
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return ConfirmQuitViewController.description(for: self, environment: environment)
+        ConfirmQuitViewController.description(for: self, environment: environment)
     }
 }
 
 final class ConfirmQuitViewController: ScreenViewController<ConfirmQuitScreen> {
-    private let questionLabel: UILabel = UILabel(frame: .zero)
-    private let confirmButton: UIButton = UIButton(frame: .zero)
-    private let cancelButton: UIButton = UIButton(frame: .zero)
+    private let questionLabel: UILabel = .init(frame: .zero)
+    private let confirmButton: UIButton = .init(frame: .zero)
+    private let cancelButton: UIButton = .init(frame: .zero)
     private var onQuitTapped: () -> Void = {}
     private var onCancelTapped: () -> Void = {}
 
diff --git a/Samples/TicTacToe/Sources/Game/ConfirmQuitWorkflow.swift b/Samples/TicTacToe/Sources/Game/ConfirmQuitWorkflow.swift
index be6979763..05191e857 100644
--- a/Samples/TicTacToe/Sources/Game/ConfirmQuitWorkflow.swift
+++ b/Samples/TicTacToe/Sources/Game/ConfirmQuitWorkflow.swift
@@ -42,7 +42,7 @@ extension ConfirmQuitWorkflow {
     }
 
     func makeInitialState() -> ConfirmQuitWorkflow.State {
-        return State(step: .confirmOnce)
+        State(step: .confirmOnce)
     }
 }
 
@@ -63,6 +63,7 @@ extension ConfirmQuitWorkflow {
 
             case .quit:
                 return .quit
+
             case .confirm:
                 state.step = .confirmTwice
                 return nil
diff --git a/Samples/TicTacToe/Sources/Game/GamePlayScreen.swift b/Samples/TicTacToe/Sources/Game/GamePlayScreen.swift
index 024f6bf25..057406061 100644
--- a/Samples/TicTacToe/Sources/Game/GamePlayScreen.swift
+++ b/Samples/TicTacToe/Sources/Game/GamePlayScreen.swift
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import WorkflowUI
 import UIKit
+import WorkflowUI
 
 struct GamePlayScreen: Screen {
     var gameState: GameState
@@ -25,17 +25,15 @@ struct GamePlayScreen: Screen {
     var onSelected: (Int, Int) -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return GamePlayViewController.description(for: self, environment: environment)
+        GamePlayViewController.description(for: self, environment: environment)
     }
 }
 
 final class GamePlayViewController: ScreenViewController<GamePlayScreen> {
-    let titleLabel: UILabel = UILabel(frame: .zero)
-    let cells: [[UIButton]] = {
-        (0 ..< 3).map { _ in
-            (0 ..< 3).map { _ in UIButton(frame: .zero) }
-        }
-    }()
+    let titleLabel: UILabel = .init(frame: .zero)
+    let cells: [[UIButton]] = (0 ..< 3).map { _ in
+        (0 ..< 3).map { _ in UIButton(frame: .zero) }
+    }
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -47,11 +45,10 @@ final class GamePlayViewController: ScreenViewController<GamePlayScreen> {
         var toggle = true
         for row in cells {
             for cell in row {
-                let backgroundColor: UIColor
-                if toggle {
-                    backgroundColor = UIColor(white: 0.92, alpha: 1.0)
+                let backgroundColor = if toggle {
+                    UIColor(white: 0.92, alpha: 1.0)
                 } else {
-                    backgroundColor = UIColor(white: 0.82, alpha: 1.0)
+                    UIColor(white: 0.82, alpha: 1.0)
                 }
                 cell.backgroundColor = backgroundColor
                 toggle = !toggle
@@ -98,25 +95,24 @@ final class GamePlayViewController: ScreenViewController<GamePlayScreen> {
     override func screenDidChange(from previousScreen: GamePlayScreen, previousEnvironment: ViewEnvironment) {
         super.screenDidChange(from: previousScreen, previousEnvironment: previousEnvironment)
 
-        let title: String
-        switch screen.gameState {
+        let title = switch screen.gameState {
         case .ongoing(turn: let turn):
             switch turn {
             case .x:
-                title = "\(screen.playerX), place your 🙅"
+                "\(screen.playerX), place your 🙅"
             case .o:
-                title = "\(screen.playerO), place your 🙆"
+                "\(screen.playerO), place your 🙆"
             }
 
         case .tie:
-            title = "It's a Tie!"
+            "It's a Tie!"
 
         case .win(let player):
             switch player {
             case .x:
-                title = "The 🙅's have it, \(screen.playerX) wins!"
+                "The 🙅's have it, \(screen.playerX) wins!"
             case .o:
-                title = "The 🙆's have it, \(screen.playerO) wins!"
+                "The 🙆's have it, \(screen.playerO) wins!"
             }
         }
         titleLabel.text = title
diff --git a/Samples/TicTacToe/Sources/Game/NewGameScreen.swift b/Samples/TicTacToe/Sources/Game/NewGameScreen.swift
index b5d4e9e74..9c843f0b8 100644
--- a/Samples/TicTacToe/Sources/Game/NewGameScreen.swift
+++ b/Samples/TicTacToe/Sources/Game/NewGameScreen.swift
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import WorkflowUI
 import UIKit
+import WorkflowUI
 
 struct NewGameScreen: Screen {
     var playerX: String
@@ -29,7 +29,7 @@ struct NewGameScreen: Screen {
     }
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return NewGameViewController.description(for: self, environment: environment)
+        NewGameViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/TicTacToe/Sources/Game/RunGameWorkflow.swift b/Samples/TicTacToe/Sources/Game/RunGameWorkflow.swift
index 6a13e2ad5..7159999db 100644
--- a/Samples/TicTacToe/Sources/Game/RunGameWorkflow.swift
+++ b/Samples/TicTacToe/Sources/Game/RunGameWorkflow.swift
@@ -42,7 +42,7 @@ extension RunGameWorkflow {
     }
 
     func makeInitialState() -> RunGameWorkflow.State {
-        return State(playerX: "X", playerO: "O", step: .newGame)
+        State(playerX: "X", playerO: "O", step: .newGame)
     }
 }
 
@@ -161,7 +161,7 @@ extension RunGameWorkflow {
     }
 
     private func newGameScreen(sink: Sink<Action>, playerX: String, playerO: String) -> NewGameScreen {
-        return NewGameScreen(
+        NewGameScreen(
             playerX: playerX,
             playerO: playerO,
             eventHandler: { event in
diff --git a/Samples/TicTacToe/Sources/Game/TakeTurnsWorkflow.swift b/Samples/TicTacToe/Sources/Game/TakeTurnsWorkflow.swift
index ec55b3a41..f5fe82fdf 100644
--- a/Samples/TicTacToe/Sources/Game/TakeTurnsWorkflow.swift
+++ b/Samples/TicTacToe/Sources/Game/TakeTurnsWorkflow.swift
@@ -35,7 +35,7 @@ extension TakeTurnsWorkflow {
     }
 
     func makeInitialState() -> TakeTurnsWorkflow.State {
-        return State(board: Board(), gameState: .ongoing(turn: .x))
+        State(board: Board(), gameState: .ongoing(turn: .x))
     }
 }
 
@@ -72,6 +72,7 @@ extension TakeTurnsWorkflow {
 
             case .tie:
                 return nil
+
             case .win:
                 return nil
             }
diff --git a/Samples/TicTacToe/Sources/Main/MainWorkflow.swift b/Samples/TicTacToe/Sources/Main/MainWorkflow.swift
index 3cc9c44f6..260f3edb0 100644
--- a/Samples/TicTacToe/Sources/Main/MainWorkflow.swift
+++ b/Samples/TicTacToe/Sources/Main/MainWorkflow.swift
@@ -35,7 +35,7 @@ extension MainWorkflow {
     }
 
     func makeInitialState() -> MainWorkflow.State {
-        return .authenticating
+        .authenticating
     }
 }
 
@@ -70,7 +70,7 @@ extension MainWorkflow {
     func render(state: MainWorkflow.State, context: RenderContext<MainWorkflow>) -> Rendering {
         switch state {
         case .authenticating:
-            return AuthenticationWorkflow(authenticationService: AuthenticationService())
+            AuthenticationWorkflow(authenticationService: AuthenticationService())
                 .mapOutput { output -> Action in
                     switch output {
                     case .authorized(session: let sessionToken):
@@ -80,7 +80,7 @@ extension MainWorkflow {
                 .rendered(in: context)
 
         case .runningGame:
-            return RunGameWorkflow().rendered(in: context)
+            RunGameWorkflow().rendered(in: context)
         }
     }
 }
diff --git a/Samples/Tuist/Config.swift b/Samples/Tuist/Config.swift
index e52eb1102..c0516df4e 100644
--- a/Samples/Tuist/Config.swift
+++ b/Samples/Tuist/Config.swift
@@ -1,8 +1,8 @@
 import ProjectDescription
 
 let config = Config(
-// This breaks snapshot tests, because iOSSnapshotTestCase depends on XCTest.
-// ENABLE_TESTING_SEARCH_PATHS should sufficient but doesn't seem to work with
-// enforceExplicitDependencies enabled.
+    // This breaks snapshot tests, because iOSSnapshotTestCase depends on XCTest.
+    // ENABLE_TESTING_SEARCH_PATHS should sufficient but doesn't seem to work with
+    // enforceExplicitDependencies enabled.
 //    generationOptions: .options(enforceExplicitDependencies: true)
 )
diff --git a/Samples/Tuist/ProjectDescriptionHelpers/Project+Workflow.swift b/Samples/Tuist/ProjectDescriptionHelpers/Project+Workflow.swift
index db4398bfc..54bf572c5 100644
--- a/Samples/Tuist/ProjectDescriptionHelpers/Project+Workflow.swift
+++ b/Samples/Tuist/ProjectDescriptionHelpers/Project+Workflow.swift
@@ -6,7 +6,6 @@ public let workflowDestinations: ProjectDescription.Destinations = .iOS
 public let workflowDeploymentTargets: DeploymentTargets = .iOS("15.0")
 
 extension Target {
-    
     public static func app(
         name: String,
         sources: ProjectDescription.SourceFilesList,
@@ -29,7 +28,7 @@ extension Target {
             dependencies: dependencies
         )
     }
-    
+
     public static func target(
         name: String,
         sources: ProjectDescription.SourceFilesList? = nil,
@@ -47,13 +46,13 @@ extension Target {
             dependencies: dependencies
         )
     }
-    
+
     public static func unitTest(
         for moduleUnderTest: String,
         testName: String = "Tests",
         sources: ProjectDescription.SourceFilesList? = nil,
         dependencies: [TargetDependency] = [],
-        environmentVariables: [String : EnvironmentVariable] = [:]
+        environmentVariables: [String: EnvironmentVariable] = [:]
     ) -> Self {
         let name = "\(moduleUnderTest)-\(testName)"
         return .target(
diff --git a/Samples/Tutorial/AppHost/Sources/AppDelegate.swift b/Samples/Tutorial/AppHost/Sources/AppDelegate.swift
index 4ae2a577c..3f17bc64e 100644
--- a/Samples/Tutorial/AppHost/Sources/AppDelegate.swift
+++ b/Samples/Tutorial/AppHost/Sources/AppDelegate.swift
@@ -17,7 +17,7 @@
 import TutorialBase
 import UIKit
 
-@UIApplicationMain
+@main
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
diff --git a/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Todo/Edit/TodoEditSampleViewController.swift b/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Todo/Edit/TodoEditSampleViewController.swift
index 57828dc50..736df2339 100644
--- a/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Todo/Edit/TodoEditSampleViewController.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Todo/Edit/TodoEditSampleViewController.swift
@@ -26,6 +26,7 @@ final class TodoEditSampleViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Todo/List/TodoListSampleViewController.swift b/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Todo/List/TodoListSampleViewController.swift
index 711141c77..1490a80ea 100644
--- a/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Todo/List/TodoListSampleViewController.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Todo/List/TodoListSampleViewController.swift
@@ -26,6 +26,7 @@ final class TodoListSampleViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/TutorialHostingViewController.swift b/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/TutorialHostingViewController.swift
index 1c6e4d21f..aaf28e1f8 100644
--- a/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/TutorialHostingViewController.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/TutorialHostingViewController.swift
@@ -28,6 +28,7 @@ public final class TutorialHostingViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Welcome/WelcomeScreen.swift b/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Welcome/WelcomeScreen.swift
index 1d0f26199..1c748943f 100644
--- a/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Welcome/WelcomeScreen.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Welcome/WelcomeScreen.swift
@@ -27,7 +27,7 @@ struct WelcomeScreen: Screen {
     var onLoginTapped: () -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return WelcomeViewController.description(for: self, environment: environment)
+        WelcomeViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Welcome/WelcomeWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Welcome/WelcomeWorkflow.swift
index 53284c9c2..8c0974642 100644
--- a/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Welcome/WelcomeWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial1Complete/Sources/Welcome/WelcomeWorkflow.swift
@@ -33,7 +33,7 @@ extension WelcomeWorkflow {
     }
 
     func makeInitialState() -> WelcomeWorkflow.State {
-        return State(name: "")
+        State(name: "")
     }
 
     func workflowDidChange(from previousWorkflow: WelcomeWorkflow, state: inout State) {}
@@ -70,7 +70,7 @@ extension WelcomeWorkflow {
         }
 
         func isEquivalent(to otherWorker: WelcomeWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/RootWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/RootWorkflow.swift
index ea9b2fc38..851a1e922 100644
--- a/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/RootWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/RootWorkflow.swift
@@ -39,7 +39,7 @@ extension RootWorkflow {
     }
 
     func makeInitialState() -> RootWorkflow.State {
-        return .welcome
+        .welcome
     }
 
     func workflowDidChange(from previousWorkflow: RootWorkflow, state: inout State) {}
@@ -80,7 +80,7 @@ extension RootWorkflow {
         }
 
         func isEquivalent(to otherWorker: RootWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Todo/Edit/TodoEditSampleViewController.swift b/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Todo/Edit/TodoEditSampleViewController.swift
index 57828dc50..736df2339 100644
--- a/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Todo/Edit/TodoEditSampleViewController.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Todo/Edit/TodoEditSampleViewController.swift
@@ -26,6 +26,7 @@ final class TodoEditSampleViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Todo/List/TodoListScreen.swift b/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Todo/List/TodoListScreen.swift
index 2e532ba10..8292bf300 100644
--- a/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Todo/List/TodoListScreen.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Todo/List/TodoListScreen.swift
@@ -26,7 +26,7 @@ struct TodoListScreen: Screen {
     var onTodoSelected: (Int) -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return TodoListViewController.description(for: self, environment: environment)
+        TodoListViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Todo/List/TodoListWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Todo/List/TodoListWorkflow.swift
index 4bd258182..1e7c3e185 100644
--- a/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Todo/List/TodoListWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Todo/List/TodoListWorkflow.swift
@@ -33,7 +33,7 @@ extension TodoListWorkflow {
     }
 
     func makeInitialState() -> TodoListWorkflow.State {
-        return State(todos: [TodoModel(title: "Take the cat for a walk", note: "Cats really need their outside sunshine time. Don't forget to walk Charlie. Hamilton is less excited about the prospect.")])
+        State(todos: [TodoModel(title: "Take the cat for a walk", note: "Cats really need their outside sunshine time. Don't forget to walk Charlie. Hamilton is less excited about the prospect.")])
     }
 
     func workflowDidChange(from previousWorkflow: TodoListWorkflow, state: inout State) {}
@@ -64,7 +64,7 @@ extension TodoListWorkflow {
         }
 
         func isEquivalent(to otherWorker: TodoListWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/TutorialHostingViewController.swift b/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/TutorialHostingViewController.swift
index 8a710d6c5..781c8c812 100644
--- a/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/TutorialHostingViewController.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/TutorialHostingViewController.swift
@@ -29,6 +29,7 @@ public final class TutorialHostingViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Welcome/WelcomeScreen.swift b/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Welcome/WelcomeScreen.swift
index 1d0f26199..1c748943f 100644
--- a/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Welcome/WelcomeScreen.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Welcome/WelcomeScreen.swift
@@ -27,7 +27,7 @@ struct WelcomeScreen: Screen {
     var onLoginTapped: () -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return WelcomeViewController.description(for: self, environment: environment)
+        WelcomeViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Welcome/WelcomeWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Welcome/WelcomeWorkflow.swift
index f70cac650..76b75fef1 100644
--- a/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Welcome/WelcomeWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial2Complete/Sources/Welcome/WelcomeWorkflow.swift
@@ -35,7 +35,7 @@ extension WelcomeWorkflow {
     }
 
     func makeInitialState() -> WelcomeWorkflow.State {
-        return State(name: "")
+        State(name: "")
     }
 
     func workflowDidChange(from previousWorkflow: WelcomeWorkflow, state: inout State) {}
@@ -77,7 +77,7 @@ extension WelcomeWorkflow {
         }
 
         func isEquivalent(to otherWorker: WelcomeWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/RootWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/RootWorkflow.swift
index 2ee5cfbd1..4c0c97c98 100644
--- a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/RootWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/RootWorkflow.swift
@@ -39,7 +39,7 @@ extension RootWorkflow {
     }
 
     func makeInitialState() -> RootWorkflow.State {
-        return .welcome
+        .welcome
     }
 
     func workflowDidChange(from previousWorkflow: RootWorkflow, state: inout State) {}
@@ -78,7 +78,7 @@ extension RootWorkflow {
         }
 
         func isEquivalent(to otherWorker: RootWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/Edit/TodoEditScreen.swift b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/Edit/TodoEditScreen.swift
index de5745f2f..0f341f8f9 100644
--- a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/Edit/TodoEditScreen.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/Edit/TodoEditScreen.swift
@@ -29,7 +29,7 @@ struct TodoEditScreen: Screen {
     var onNoteChanged: (String) -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return TodoEditViewController.description(for: self, environment: environment)
+        TodoEditViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/Edit/TodoEditWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/Edit/TodoEditWorkflow.swift
index cd2c607b2..7bcca92ec 100644
--- a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/Edit/TodoEditWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/Edit/TodoEditWorkflow.swift
@@ -41,7 +41,7 @@ extension TodoEditWorkflow {
     }
 
     func makeInitialState() -> TodoEditWorkflow.State {
-        return State(todo: initialTodo)
+        State(todo: initialTodo)
     }
 
     func workflowDidChange(from previousWorkflow: TodoEditWorkflow, state: inout State) {
@@ -99,7 +99,7 @@ extension TodoEditWorkflow {
         }
 
         func isEquivalent(to otherWorker: TodoEditWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/List/TodoListScreen.swift b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/List/TodoListScreen.swift
index 2e532ba10..8292bf300 100644
--- a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/List/TodoListScreen.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/List/TodoListScreen.swift
@@ -26,7 +26,7 @@ struct TodoListScreen: Screen {
     var onTodoSelected: (Int) -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return TodoListViewController.description(for: self, environment: environment)
+        TodoListViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/List/TodoListWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/List/TodoListWorkflow.swift
index 6dab64849..d063a1ce2 100644
--- a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/List/TodoListWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Todo/List/TodoListWorkflow.swift
@@ -48,7 +48,7 @@ extension TodoListWorkflow {
     }
 
     func makeInitialState() -> TodoListWorkflow.State {
-        return State(
+        State(
             todos: [
                 TodoModel(
                     title: "Take the cat for a walk",
@@ -110,7 +110,7 @@ extension TodoListWorkflow {
         }
 
         func isEquivalent(to otherWorker: TodoListWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/TutorialHostingViewController.swift b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/TutorialHostingViewController.swift
index 8a710d6c5..781c8c812 100644
--- a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/TutorialHostingViewController.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/TutorialHostingViewController.swift
@@ -29,6 +29,7 @@ public final class TutorialHostingViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Welcome/WelcomeScreen.swift b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Welcome/WelcomeScreen.swift
index 1d0f26199..1c748943f 100644
--- a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Welcome/WelcomeScreen.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Welcome/WelcomeScreen.swift
@@ -27,7 +27,7 @@ struct WelcomeScreen: Screen {
     var onLoginTapped: () -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return WelcomeViewController.description(for: self, environment: environment)
+        WelcomeViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Welcome/WelcomeWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Welcome/WelcomeWorkflow.swift
index f70cac650..76b75fef1 100644
--- a/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Welcome/WelcomeWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial3Complete/Sources/Welcome/WelcomeWorkflow.swift
@@ -35,7 +35,7 @@ extension WelcomeWorkflow {
     }
 
     func makeInitialState() -> WelcomeWorkflow.State {
-        return State(name: "")
+        State(name: "")
     }
 
     func workflowDidChange(from previousWorkflow: WelcomeWorkflow, state: inout State) {}
@@ -77,7 +77,7 @@ extension WelcomeWorkflow {
         }
 
         func isEquivalent(to otherWorker: WelcomeWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/RootWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/RootWorkflow.swift
index e66c8d8e5..59da10338 100644
--- a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/RootWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/RootWorkflow.swift
@@ -39,7 +39,7 @@ extension RootWorkflow {
     }
 
     func makeInitialState() -> RootWorkflow.State {
-        return .welcome
+        .welcome
     }
 
     func workflowDidChange(from previousWorkflow: RootWorkflow, state: inout State) {}
@@ -80,7 +80,7 @@ extension RootWorkflow {
         }
 
         func isEquivalent(to otherWorker: RootWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/Edit/TodoEditScreen.swift b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/Edit/TodoEditScreen.swift
index ec737a423..a33859a3e 100644
--- a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/Edit/TodoEditScreen.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/Edit/TodoEditScreen.swift
@@ -29,7 +29,7 @@ struct TodoEditScreen: Screen {
     var onNoteChanged: (String) -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return TodoEditViewController.description(for: self, environment: environment)
+        TodoEditViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/Edit/TodoEditWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/Edit/TodoEditWorkflow.swift
index cd2c607b2..7bcca92ec 100644
--- a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/Edit/TodoEditWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/Edit/TodoEditWorkflow.swift
@@ -41,7 +41,7 @@ extension TodoEditWorkflow {
     }
 
     func makeInitialState() -> TodoEditWorkflow.State {
-        return State(todo: initialTodo)
+        State(todo: initialTodo)
     }
 
     func workflowDidChange(from previousWorkflow: TodoEditWorkflow, state: inout State) {
@@ -99,7 +99,7 @@ extension TodoEditWorkflow {
         }
 
         func isEquivalent(to otherWorker: TodoEditWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/List/TodoListScreen.swift b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/List/TodoListScreen.swift
index 7108db7dd..7c5c29fcd 100644
--- a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/List/TodoListScreen.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/List/TodoListScreen.swift
@@ -26,7 +26,7 @@ struct TodoListScreen: Screen {
     var onTodoSelected: (Int) -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return TodoListViewController.description(for: self, environment: environment)
+        TodoListViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/List/TodoListWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/List/TodoListWorkflow.swift
index c09dde912..d87110330 100644
--- a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/List/TodoListWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/List/TodoListWorkflow.swift
@@ -42,7 +42,7 @@ extension TodoListWorkflow {
     struct State {}
 
     func makeInitialState() -> TodoListWorkflow.State {
-        return State()
+        State()
     }
 
     func workflowDidChange(from previousWorkflow: TodoListWorkflow, state: inout State) {}
@@ -62,15 +62,15 @@ extension TodoListWorkflow {
             switch self {
             case .onBack:
                 // When a `.onBack` action is received, emit a `.back` output
-                return .back
+                .back
 
             case .selectTodo(index: let index):
                 // Tell our parent that a todo item was selected.
-                return .selectTodo(index: index)
+                .selectTodo(index: index)
 
             case .new:
                 // Tell our parent a new todo item should be created.
-                return .newTodo
+                .newTodo
             }
         }
     }
@@ -87,7 +87,7 @@ extension TodoListWorkflow {
         }
 
         func isEquivalent(to otherWorker: TodoListWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/TodoWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/TodoWorkflow.swift
index acb67870f..86dd7ad9f 100644
--- a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/TodoWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Todo/TodoWorkflow.swift
@@ -47,7 +47,7 @@ extension TodoWorkflow {
     }
 
     func makeInitialState() -> TodoWorkflow.State {
-        return State(
+        State(
             todos: [
                 TodoModel(
                     title: "Take the cat for a walk",
@@ -129,7 +129,7 @@ extension TodoWorkflow {
         }
 
         func isEquivalent(to otherWorker: TodoWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/TutorialHostingViewController.swift b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/TutorialHostingViewController.swift
index 8a710d6c5..781c8c812 100644
--- a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/TutorialHostingViewController.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/TutorialHostingViewController.swift
@@ -29,6 +29,7 @@ public final class TutorialHostingViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Welcome/WelcomeScreen.swift b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Welcome/WelcomeScreen.swift
index 474033f3a..dc1b66e10 100644
--- a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Welcome/WelcomeScreen.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Welcome/WelcomeScreen.swift
@@ -27,7 +27,7 @@ struct WelcomeScreen: Screen {
     var onLoginTapped: () -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return WelcomeViewController.description(for: self, environment: environment)
+        WelcomeViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Welcome/WelcomeWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Welcome/WelcomeWorkflow.swift
index f70cac650..76b75fef1 100644
--- a/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Welcome/WelcomeWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial4Complete/Sources/Welcome/WelcomeWorkflow.swift
@@ -35,7 +35,7 @@ extension WelcomeWorkflow {
     }
 
     func makeInitialState() -> WelcomeWorkflow.State {
-        return State(name: "")
+        State(name: "")
     }
 
     func workflowDidChange(from previousWorkflow: WelcomeWorkflow, state: inout State) {}
@@ -77,7 +77,7 @@ extension WelcomeWorkflow {
         }
 
         func isEquivalent(to otherWorker: WelcomeWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/RootWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/RootWorkflow.swift
index f1c7554e7..6b4b07123 100644
--- a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/RootWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/RootWorkflow.swift
@@ -39,7 +39,7 @@ extension RootWorkflow {
     }
 
     func makeInitialState() -> RootWorkflow.State {
-        return .welcome
+        .welcome
     }
 
     func workflowDidChange(from previousWorkflow: RootWorkflow, state: inout State) {}
@@ -78,7 +78,7 @@ extension RootWorkflow {
         }
 
         func isEquivalent(to otherWorker: RootWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/Edit/TodoEditScreen.swift b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/Edit/TodoEditScreen.swift
index de5745f2f..0f341f8f9 100644
--- a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/Edit/TodoEditScreen.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/Edit/TodoEditScreen.swift
@@ -29,7 +29,7 @@ struct TodoEditScreen: Screen {
     var onNoteChanged: (String) -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return TodoEditViewController.description(for: self, environment: environment)
+        TodoEditViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/Edit/TodoEditWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/Edit/TodoEditWorkflow.swift
index cd2c607b2..7bcca92ec 100644
--- a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/Edit/TodoEditWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/Edit/TodoEditWorkflow.swift
@@ -41,7 +41,7 @@ extension TodoEditWorkflow {
     }
 
     func makeInitialState() -> TodoEditWorkflow.State {
-        return State(todo: initialTodo)
+        State(todo: initialTodo)
     }
 
     func workflowDidChange(from previousWorkflow: TodoEditWorkflow, state: inout State) {
@@ -99,7 +99,7 @@ extension TodoEditWorkflow {
         }
 
         func isEquivalent(to otherWorker: TodoEditWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/List/TodoListScreen.swift b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/List/TodoListScreen.swift
index 2e532ba10..8292bf300 100644
--- a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/List/TodoListScreen.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/List/TodoListScreen.swift
@@ -26,7 +26,7 @@ struct TodoListScreen: Screen {
     var onTodoSelected: (Int) -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return TodoListViewController.description(for: self, environment: environment)
+        TodoListViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/List/TodoListWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/List/TodoListWorkflow.swift
index c09dde912..d87110330 100644
--- a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/List/TodoListWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/List/TodoListWorkflow.swift
@@ -42,7 +42,7 @@ extension TodoListWorkflow {
     struct State {}
 
     func makeInitialState() -> TodoListWorkflow.State {
-        return State()
+        State()
     }
 
     func workflowDidChange(from previousWorkflow: TodoListWorkflow, state: inout State) {}
@@ -62,15 +62,15 @@ extension TodoListWorkflow {
             switch self {
             case .onBack:
                 // When a `.onBack` action is received, emit a `.back` output
-                return .back
+                .back
 
             case .selectTodo(index: let index):
                 // Tell our parent that a todo item was selected.
-                return .selectTodo(index: index)
+                .selectTodo(index: index)
 
             case .new:
                 // Tell our parent a new todo item should be created.
-                return .newTodo
+                .newTodo
             }
         }
     }
@@ -87,7 +87,7 @@ extension TodoListWorkflow {
         }
 
         func isEquivalent(to otherWorker: TodoListWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/TodoWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/TodoWorkflow.swift
index 8df6427c7..000cee194 100644
--- a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/TodoWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Todo/TodoWorkflow.swift
@@ -47,7 +47,7 @@ extension TodoWorkflow {
     }
 
     func makeInitialState() -> TodoWorkflow.State {
-        return State(
+        State(
             todos: [
                 TodoModel(
                     title: "Take the cat for a walk",
@@ -129,7 +129,7 @@ extension TodoWorkflow {
         }
 
         func isEquivalent(to otherWorker: TodoWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/TutorialHostingViewController.swift b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/TutorialHostingViewController.swift
index 8a710d6c5..781c8c812 100644
--- a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/TutorialHostingViewController.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/TutorialHostingViewController.swift
@@ -29,6 +29,7 @@ public final class TutorialHostingViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Welcome/WelcomeScreen.swift b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Welcome/WelcomeScreen.swift
index 1d0f26199..1c748943f 100644
--- a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Welcome/WelcomeScreen.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Welcome/WelcomeScreen.swift
@@ -27,7 +27,7 @@ struct WelcomeScreen: Screen {
     var onLoginTapped: () -> Void
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return WelcomeViewController.description(for: self, environment: environment)
+        WelcomeViewController.description(for: self, environment: environment)
     }
 }
 
diff --git a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Welcome/WelcomeWorkflow.swift b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Welcome/WelcomeWorkflow.swift
index 62128b371..9f7c2382a 100644
--- a/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Welcome/WelcomeWorkflow.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial5Complete/Sources/Welcome/WelcomeWorkflow.swift
@@ -35,7 +35,7 @@ extension WelcomeWorkflow {
     }
 
     func makeInitialState() -> WelcomeWorkflow.State {
-        return State(name: "")
+        State(name: "")
     }
 
     func workflowDidChange(from previousWorkflow: WelcomeWorkflow, state: inout State) {}
@@ -82,7 +82,7 @@ extension WelcomeWorkflow {
         }
 
         func isEquivalent(to otherWorker: WelcomeWorker) -> Bool {
-            return true
+            true
         }
     }
 }
diff --git a/Samples/Tutorial/Frameworks/Tutorial5Complete/Tests/RootWorkflowTests.swift b/Samples/Tutorial/Frameworks/Tutorial5Complete/Tests/RootWorkflowTests.swift
index 57c35a16d..8c3b5a85c 100644
--- a/Samples/Tutorial/Frameworks/Tutorial5Complete/Tests/RootWorkflowTests.swift
+++ b/Samples/Tutorial/Frameworks/Tutorial5Complete/Tests/RootWorkflowTests.swift
@@ -17,9 +17,11 @@
 import Workflow
 import WorkflowTesting
 import XCTest
+
 // Import `BackStackContainer` as testable so that the items in the `BackStackScreen` can be inspected.
 @testable import BackStackContainer
 @testable import Tutorial5Complete
+
 // Import `WorkflowUI` as testable so that the wrappedScreen in `AnyScreen` can be accessed.
 @testable import WorkflowUI
 
diff --git a/Samples/Tutorial/Frameworks/TutorialBase/Sources/Todo/Edit/TodoEditSampleViewController.swift b/Samples/Tutorial/Frameworks/TutorialBase/Sources/Todo/Edit/TodoEditSampleViewController.swift
index 57828dc50..736df2339 100644
--- a/Samples/Tutorial/Frameworks/TutorialBase/Sources/Todo/Edit/TodoEditSampleViewController.swift
+++ b/Samples/Tutorial/Frameworks/TutorialBase/Sources/Todo/Edit/TodoEditSampleViewController.swift
@@ -26,6 +26,7 @@ final class TodoEditSampleViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/Samples/Tutorial/Frameworks/TutorialBase/Sources/Todo/List/TodoListSampleViewController.swift b/Samples/Tutorial/Frameworks/TutorialBase/Sources/Todo/List/TodoListSampleViewController.swift
index 711141c77..1490a80ea 100644
--- a/Samples/Tutorial/Frameworks/TutorialBase/Sources/Todo/List/TodoListSampleViewController.swift
+++ b/Samples/Tutorial/Frameworks/TutorialBase/Sources/Todo/List/TodoListSampleViewController.swift
@@ -26,6 +26,7 @@ final class TodoListSampleViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/Samples/Tutorial/Frameworks/TutorialBase/Sources/TutorialHostingViewController.swift b/Samples/Tutorial/Frameworks/TutorialBase/Sources/TutorialHostingViewController.swift
index fd8c4eeac..549c171de 100644
--- a/Samples/Tutorial/Frameworks/TutorialBase/Sources/TutorialHostingViewController.swift
+++ b/Samples/Tutorial/Frameworks/TutorialBase/Sources/TutorialHostingViewController.swift
@@ -28,6 +28,7 @@ public final class TutorialHostingViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/Samples/Tutorial/Frameworks/TutorialBase/Sources/Welcome/WelcomeSampleViewController.swift b/Samples/Tutorial/Frameworks/TutorialBase/Sources/Welcome/WelcomeSampleViewController.swift
index 439b7f99b..23f0a90fd 100644
--- a/Samples/Tutorial/Frameworks/TutorialBase/Sources/Welcome/WelcomeSampleViewController.swift
+++ b/Samples/Tutorial/Frameworks/TutorialBase/Sources/Welcome/WelcomeSampleViewController.swift
@@ -25,6 +25,7 @@ final class WelcomeSampleViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/Samples/Tutorial/Frameworks/TutorialViews/Sources/TodoListView.swift b/Samples/Tutorial/Frameworks/TutorialViews/Sources/TodoListView.swift
index 8a89c44fc..d4f6aba18 100644
--- a/Samples/Tutorial/Frameworks/TutorialViews/Sources/TodoListView.swift
+++ b/Samples/Tutorial/Frameworks/TutorialViews/Sources/TodoListView.swift
@@ -49,6 +49,7 @@ public final class TodoListView: UIView, UITableViewDelegate, UITableViewDataSou
         addSubview(tableView)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -78,7 +79,7 @@ public final class TodoListView: UIView, UITableViewDelegate, UITableViewDataSou
     // MARK: UITableViewDelegate, UITableViewDataSource
 
     public func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return todoList.count
+        todoList.count
     }
 
     public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
diff --git a/Samples/Tutorial/Frameworks/TutorialViews/Sources/WelcomeView.swift b/Samples/Tutorial/Frameworks/TutorialViews/Sources/WelcomeView.swift
index 940d2ed9e..4c09a6f0d 100644
--- a/Samples/Tutorial/Frameworks/TutorialViews/Sources/WelcomeView.swift
+++ b/Samples/Tutorial/Frameworks/TutorialViews/Sources/WelcomeView.swift
@@ -56,6 +56,7 @@ public final class WelcomeView: UIView {
         addSubview(button)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/Samples/Tutorial/Project.swift b/Samples/Tutorial/Project.swift
index b9e430d32..2ee37b5a8 100644
--- a/Samples/Tutorial/Project.swift
+++ b/Samples/Tutorial/Project.swift
@@ -17,7 +17,7 @@ let project = Project(
                 .target(name: "Tutorial5Complete"),
             ]
         ),
-        
+
         .target(
             name: "Tutorial1Complete",
             sources: "Frameworks/Tutorial1Complete/Sources/**",
@@ -116,6 +116,6 @@ let project = Project(
                     .testableTarget(target: .target("TutorialBase-Tests")),
                 ]
             )
-        )
+        ),
     ]
 )
diff --git a/Samples/WorkflowCombineSampleApp/WorkflowCombineSampleApp/AppDelegate.swift b/Samples/WorkflowCombineSampleApp/WorkflowCombineSampleApp/AppDelegate.swift
index e35f0f8b4..01a97ed9a 100644
--- a/Samples/WorkflowCombineSampleApp/WorkflowCombineSampleApp/AppDelegate.swift
+++ b/Samples/WorkflowCombineSampleApp/WorkflowCombineSampleApp/AppDelegate.swift
@@ -8,7 +8,7 @@
 import UIKit
 import WorkflowUI
 
-@UIApplicationMain
+@main
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
diff --git a/Samples/Workspace.swift b/Samples/Workspace.swift
index 6e24e2b05..1b78e67bc 100644
--- a/Samples/Workspace.swift
+++ b/Samples/Workspace.swift
@@ -25,7 +25,6 @@ let workspace = Workspace(
     ]
 )
 
-
 extension Scheme {
     public static func workflow(_ target: String) -> Self {
         .scheme(
diff --git a/Scripts/git-format-staged b/Scripts/git-format-staged
new file mode 100755
index 000000000..0c34d50b7
--- /dev/null
+++ b/Scripts/git-format-staged
@@ -0,0 +1,281 @@
+#!/usr/bin/env python3
+
+# Copied from https://github.com/hallettj/git-format-staged/blob/a4dbdae9df537e6606308c82dd333e9940c9a233/git-format-staged
+
+# Git command to transform staged files according to a command that accepts file
+# content on stdin and produces output on stdout. This command is useful in
+# combination with `git add -p` which allows you to stage specific changes in
+# a file. This command runs a formatter on the file with staged changes while
+# ignoring unstaged changes.
+#
+# Usage: git-format-staged [OPTION]... [FILE]...
+# Example: git-format-staged --formatter 'prettier --stdin-filepath "{}"' '*.js'
+#
+# Tested with Python versions 3.8 - 3.13.
+#
+# Original author: Jesse Hallett <jesse@sitr.us>
+
+from __future__ import print_function
+import argparse
+from fnmatch import fnmatch
+from gettext import gettext as _
+import os
+import re
+import subprocess
+import sys
+
+# The string $VERSION is replaced during the publish process.
+VERSION = '$VERSION'
+PROG = sys.argv[0]
+
+def info(msg):
+    print(msg, file=sys.stdout)
+
+def warn(msg):
+    print('{}: warning: {}'.format(PROG, msg), file=sys.stderr)
+
+def fatal(msg):
+    print('{}: error: {}'.format(PROG, msg), file=sys.stderr)
+    exit(1)
+
+def format_staged_files(file_patterns, formatter, git_root, update_working_tree=True, write=True, verbose=False):
+    try:
+        output = subprocess.check_output([
+            'git', 'diff-index',
+            '--cached',
+            '--diff-filter=AM', # select only file additions and modifications
+            '--no-renames',
+            'HEAD'
+            ])
+        for line in output.splitlines():
+            entry = parse_diff(line.decode('utf-8'))
+            entry_path = normalize_path(entry['src_path'], relative_to=git_root)
+            if entry['dst_mode'] == '120000':
+                # Do not process symlinks
+                continue
+            if not (matches_some_path(file_patterns, entry_path)):
+                continue
+            if format_file_in_index(formatter, entry, update_working_tree=update_working_tree, write=write, verbose=verbose):
+                info('Reformatted {} with {}'.format(entry['src_path'], formatter))
+    except Exception as err:
+        fatal(str(err))
+
+# Run formatter on file in the git index. Creates a new git object with the
+# result, and replaces the content of the file in the index with that object.
+# Returns hash of the new object if formatting produced any changes.
+def format_file_in_index(formatter, diff_entry, update_working_tree=True, write=True, verbose=False):
+    orig_hash = diff_entry['dst_hash']
+    new_hash = format_object(formatter, orig_hash, diff_entry['src_path'], verbose=verbose)
+
+    # If the new hash is the same then the formatter did not make any changes.
+    if not write or new_hash == orig_hash:
+        return None
+
+    # If the content of the new object is empty then the formatter did not
+    # produce any output. We want to abort instead of replacing the file with an
+    # empty one.
+    if object_is_empty(new_hash):
+        return None
+
+    replace_file_in_index(diff_entry, new_hash)
+
+    if update_working_tree:
+        try:
+            patch_working_file(diff_entry['src_path'], orig_hash, new_hash)
+        except Exception as err:
+            # Errors patching working tree files are not fatal
+            warn(str(err))
+
+    return new_hash
+
+file_path_placeholder = re.compile(r'\{\}')
+
+# Run formatter on a git blob identified by its hash. Writes output to a new git
+# blob, and returns the hash of the new blob.
+def format_object(formatter, object_hash, file_path, verbose=False):
+    get_content = subprocess.Popen(
+            ['git', 'cat-file', '-p', object_hash],
+            stdout=subprocess.PIPE
+            )
+    command = re.sub(file_path_placeholder, file_path, formatter)
+    if verbose:
+        info(command)
+    format_content = subprocess.Popen(
+            command,
+            shell=True,
+            stdin=get_content.stdout,
+            stdout=subprocess.PIPE
+            )
+    write_object = subprocess.Popen(
+            ['git', 'hash-object', '-w', '--stdin'],
+            stdin=format_content.stdout,
+            stdout=subprocess.PIPE
+            )
+
+    get_content.stdout.close()
+    format_content.stdout.close()
+
+    if get_content.wait() != 0:
+        raise ValueError('unable to read file content from object database: ' + object_hash)
+
+    if format_content.wait() != 0:
+        raise Exception('formatter exited with non-zero status') # TODO: capture stderr from format command
+
+    new_hash, err = write_object.communicate()
+
+    if write_object.returncode != 0:
+        raise Exception('unable to write formatted content to object database')
+
+    return new_hash.decode('utf-8').rstrip()
+
+def object_is_empty(object_hash):
+    get_content = subprocess.Popen(
+            ['git', 'cat-file', '-p', object_hash],
+            stdout=subprocess.PIPE
+        )
+    content, err = get_content.communicate()
+
+    if get_content.returncode != 0:
+        raise Exception('unable to verify content of formatted object')
+
+    return not content
+
+def replace_file_in_index(diff_entry, new_object_hash):
+    subprocess.check_call(['git', 'update-index',
+        '--cacheinfo', '{},{},{}'.format(
+            diff_entry['dst_mode'],
+            new_object_hash,
+            diff_entry['src_path']
+            )])
+
+def patch_working_file(path, orig_object_hash, new_object_hash):
+    patch = subprocess.check_output(
+            ['git', 'diff', '--no-ext-diff', '--color=never', orig_object_hash, new_object_hash]
+            )
+
+    # Substitute object hashes in patch header with path to working tree file
+    patch_b = patch.replace(orig_object_hash.encode(), path.encode()).replace(new_object_hash.encode(), path.encode())
+
+    apply_patch = subprocess.Popen(
+            ['git', 'apply', '-'],
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE
+            )
+
+    output, err = apply_patch.communicate(input=patch_b)
+
+    if apply_patch.returncode != 0:
+        raise Exception('could not apply formatting changes to working tree file {}'.format(path))
+
+# Format: src_mode dst_mode src_hash dst_hash status/score? src_path dst_path?
+diff_pat = re.compile(r'^:(\d+) (\d+) ([a-f0-9]+) ([a-f0-9]+) ([A-Z])(\d+)?\t([^\t]+)(?:\t([^\t]+))?$')
+
+# Parse output from `git diff-index`
+def parse_diff(diff):
+    m = diff_pat.match(diff)
+    if not m:
+        raise ValueError('Failed to parse diff-index line: ' + diff)
+    return {
+            'src_mode': unless_zeroed(m.group(1)),
+            'dst_mode': unless_zeroed(m.group(2)),
+            'src_hash': unless_zeroed(m.group(3)),
+            'dst_hash': unless_zeroed(m.group(4)),
+            'status': m.group(5),
+            'score': int(m.group(6)) if m.group(6) else None,
+            'src_path': m.group(7),
+            'dst_path': m.group(8)
+            }
+
+zeroed_pat = re.compile(r'^0+$')
+
+# Returns the argument unless the argument is a string of zeroes, in which case
+# returns `None`
+def unless_zeroed(s):
+    return s if not zeroed_pat.match(s) else None
+
+def get_git_root():
+    return subprocess.check_output(
+            ['git', 'rev-parse', '--show-toplevel']
+            ).decode('utf-8').rstrip()
+
+def normalize_path(p, relative_to=None):
+    return os.path.abspath(
+            os.path.join(relative_to, p) if relative_to else p
+            )
+
+def matches_some_path(patterns, target):
+    is_match = False
+    for signed_pattern in patterns:
+        (is_pattern_positive, pattern) = from_signed_pattern(signed_pattern)
+        if fnmatch(target, normalize_path(pattern)):
+            is_match = is_pattern_positive
+    return is_match
+
+# Checks for a '!' as the first character of a pattern, returns the rest of the
+# pattern in a tuple. The tuple takes the form (is_pattern_positive, pattern).
+# For example:
+#     from_signed_pattern('!pat') == (False, 'pat')
+#     from_signed_pattern('pat') == (True, 'pat')
+def from_signed_pattern(pattern):
+    if pattern[0] == '!':
+        return (False, pattern[1:])
+    else:
+        return (True, pattern)
+
+class CustomArgumentParser(argparse.ArgumentParser):
+    def parse_args(self, args=None, namespace=None):
+        args, argv = self.parse_known_args(args, namespace)
+        if argv:
+            msg = argparse._(
+                    'unrecognized arguments: %s. Do you need to quote your formatter command?'
+                    )
+            self.error(msg % ' '.join(argv))
+        return args
+
+if __name__ == '__main__':
+    parser = CustomArgumentParser(
+            description='Transform staged files using a formatting command that accepts content via stdin and produces a result via stdout.',
+            epilog='Example: %(prog)s --formatter "prettier --stdin-filepath \'{}\'" "src/*.js" "test/*.js"'
+            )
+    parser.add_argument(
+            '--formatter', '-f',
+            required=True,
+            help='Shell command to format files, will run once per file. Occurrences of the placeholder `{}` will be replaced with a path to the file being formatted. (Example: "prettier --stdin-filepath \'{}\'")'
+            )
+    parser.add_argument(
+            '--no-update-working-tree',
+            action='store_true',
+            help='By default formatting changes made to staged file content will also be applied to working tree files via a patch. This option disables that behavior, leaving working tree files untouched.'
+            )
+    parser.add_argument(
+            '--no-write',
+            action='store_true',
+            help='Prevents %(prog)s from modifying staged or working tree files. You can use this option to check staged changes with a linter instead of formatting. With this option stdout from the formatter command is ignored. Example: %(prog)s --no-write -f "eslint --stdin --stdin-filename \'{}\' >&2" "*.js"'
+            )
+    parser.add_argument(
+            '--version',
+            action='version',
+            version='%(prog)s version {}'.format(VERSION),
+            help='Display version of %(prog)s'
+            )
+    parser.add_argument(
+            '--verbose',
+            help='Show the formatting commands that are running',
+            action='store_true'
+            )
+    parser.add_argument(
+            'files',
+            nargs='+',
+            help='Patterns that specify files to format. The formatter will only transform staged files that are given here. Patterns may be literal file paths, or globs which will be tested against staged file paths using Python\'s fnmatch function. For example "src/*.js" will match all files with a .js extension in src/ and its subdirectories. Patterns may be negated to exclude files using a "!" character. Patterns are evaluated left-to-right. (Example: "main.js" "src/*.js" "test/*.js" "!test/todo/*")'
+            )
+    args = parser.parse_args()
+    files = vars(args)['files']
+    format_staged_files(
+            file_patterns=files,
+            formatter=vars(args)['formatter'],
+            git_root=get_git_root(),
+            update_working_tree=not vars(args)['no_update_working_tree'],
+            write=not vars(args)['no_write'],
+            verbose=vars(args)['verbose']
+            )
diff --git a/TestingSupport/AppHost/Sources/AppDelegate.swift b/TestingSupport/AppHost/Sources/AppDelegate.swift
index 140454c22..10e2768d2 100644
--- a/TestingSupport/AppHost/Sources/AppDelegate.swift
+++ b/TestingSupport/AppHost/Sources/AppDelegate.swift
@@ -2,14 +2,12 @@ import UIKit
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
-
     var window: UIWindow?
 
     func application(
         _ application: UIApplication,
         didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
     ) -> Bool {
-
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.rootViewController = UIViewController()
 
diff --git a/ViewEnvironment/Sources/ViewEnvironment.swift b/ViewEnvironment/Sources/ViewEnvironment.swift
index 8bc0d3fd2..ff788c76c 100644
--- a/ViewEnvironment/Sources/ViewEnvironment.swift
+++ b/ViewEnvironment/Sources/ViewEnvironment.swift
@@ -26,7 +26,7 @@ public struct ViewEnvironment {
     /// root workflow into a root WorkflowHostingController or when writing tests.
     /// In other scenarios, containers should pass down the ViewEnvironment
     /// value they get from above.
-    public static let empty: ViewEnvironment = ViewEnvironment()
+    public static let empty: ViewEnvironment = .init()
 
     /// Storage of [K.Type: K.Value] where K: ViewEnvironmentKey
     private var storage: [ObjectIdentifier: Any]
@@ -44,9 +44,9 @@ public struct ViewEnvironment {
     public subscript<Key>(key: Key.Type) -> Key.Value where Key: ViewEnvironmentKey {
         get {
             if let value = storage[ObjectIdentifier(key)] as? Key.Value {
-                return value
+                value
             } else {
-                return Key.defaultValue
+                Key.defaultValue
             }
         }
 
diff --git a/ViewEnvironmentUI/Sources/UIViewController+ViewEnvironmentPropagating.swift b/ViewEnvironmentUI/Sources/UIViewController+ViewEnvironmentPropagating.swift
index de3708177..5b26e7e03 100644
--- a/ViewEnvironmentUI/Sources/UIViewController+ViewEnvironmentPropagating.swift
+++ b/ViewEnvironmentUI/Sources/UIViewController+ViewEnvironmentPropagating.swift
@@ -27,7 +27,7 @@ extension UIViewController: ViewEnvironmentPropagating {
     public var defaultEnvironmentDescendants: [ViewEnvironmentPropagating] {
         var descendants = children
 
-        if let presentedViewController = presentedViewController {
+        if let presentedViewController {
             descendants.append(presentedViewController)
         }
 
diff --git a/ViewEnvironmentUI/Sources/ViewEnvironmentObserving.swift b/ViewEnvironmentUI/Sources/ViewEnvironmentObserving.swift
index d7ba58fb3..83e82122d 100644
--- a/ViewEnvironmentUI/Sources/ViewEnvironmentObserving.swift
+++ b/ViewEnvironmentUI/Sources/ViewEnvironmentObserving.swift
@@ -49,7 +49,7 @@ import ViewEnvironment
 ///
 public protocol ViewEnvironmentObserving: ViewEnvironmentPropagating {
     /// Customizes the `ViewEnvironment` as it flows through this propagation node to provide overrides to environment
-    /// values. These customizations will apply to the environment on this node (e.g. `self.environment` and the 
+    /// values. These customizations will apply to the environment on this node (e.g. `self.environment` and the
     /// parameter of `apply(environment:)`) and will be propagated to all descendant nodes.
     ///
     /// If you'd like to just inherit the environment from above, leave this function body empty.
diff --git a/ViewEnvironmentUI/Sources/ViewEnvironmentPropagating.swift b/ViewEnvironmentUI/Sources/ViewEnvironmentPropagating.swift
index 8f53981cc..35547de96 100644
--- a/ViewEnvironmentUI/Sources/ViewEnvironmentPropagating.swift
+++ b/ViewEnvironmentUI/Sources/ViewEnvironmentPropagating.swift
@@ -197,11 +197,11 @@ extension ViewEnvironmentPropagating {
         customizations.append(storedCustomization)
         return .init { [weak self] in
             guard let self,
-                let index = self.customizations.firstIndex(where: { $0 === storedCustomization })
+                  let index = customizations.firstIndex(where: { $0 === storedCustomization })
             else {
                 return
             }
-            self.customizations.remove(at: index)
+            customizations.remove(at: index)
         }
     }
 
diff --git a/ViewEnvironmentUI/Tests/ViewEnvironmentObservingTests.swift b/ViewEnvironmentUI/Tests/ViewEnvironmentObservingTests.swift
index 1167bd788..03ac337e0 100644
--- a/ViewEnvironmentUI/Tests/ViewEnvironmentObservingTests.swift
+++ b/ViewEnvironmentUI/Tests/ViewEnvironmentObservingTests.swift
@@ -458,6 +458,7 @@ extension ViewEnvironmentObservingTests {
             applyEnvironmentIfNeeded()
         }
 
+        @available(*, unavailable)
         required init?(coder: NSCoder) { fatalError("") }
     }
 
@@ -489,6 +490,7 @@ extension ViewEnvironmentObservingTests {
             super.layoutSubviews()
         }
 
+        @available(*, unavailable)
         required init?(coder: NSCoder) { fatalError("") }
     }
 }
diff --git a/Workflow/Sources/AnyWorkflow.swift b/Workflow/Sources/AnyWorkflow.swift
index a142b534b..c6e347bc8 100644
--- a/Workflow/Sources/AnyWorkflow.swift
+++ b/Workflow/Sources/AnyWorkflow.swift
@@ -40,7 +40,7 @@ public struct AnyWorkflow<Rendering, Output> {
 
     /// The underlying workflow's implementation type.
     public var workflowType: Any.Type {
-        return storage.workflowType
+        storage.workflowType
     }
 }
 
@@ -56,7 +56,7 @@ extension AnyWorkflow: Workflow {
     }
 
     public func asAnyWorkflow() -> AnyWorkflow<Rendering, Output> {
-        return self
+        self
     }
 }
 
@@ -67,7 +67,7 @@ extension AnyWorkflow {
     ///
     /// - Returns: A type erased workflow with the new output type (the rendering type remains unchanged).
     public func mapOutput<NewOutput>(_ transform: @escaping (Output) -> NewOutput) -> AnyWorkflow<Rendering, NewOutput> {
-        let storage = self.storage.mapOutput(transform: transform)
+        let storage = storage.mapOutput(transform: transform)
         return AnyWorkflow<Rendering, NewOutput>(storage: storage)
     }
 
@@ -77,7 +77,7 @@ extension AnyWorkflow {
     ///
     /// - Returns: A type erased workflow with the new rendering type (the output type remains unchanged).
     public func mapRendering<NewRendering>(_ transform: @escaping (Rendering) -> NewRendering) -> AnyWorkflow<NewRendering, Output> {
-        let storage = self.storage.mapRendering(transform: transform)
+        let storage = storage.mapRendering(transform: transform)
         return AnyWorkflow<NewRendering, Output>(storage: storage)
     }
 
@@ -91,8 +91,8 @@ extension AnyWorkflow {
     /// That type information *is* present in our storage object, however, so we
     /// pass the context down to that storage object which will ultimately call
     /// through to `context.render(workflow:key:reducer:)`.
-    internal func render<Parent, Action>(context: RenderContext<Parent>, key: String, outputMap: @escaping (Output) -> Action) -> Rendering where Action: WorkflowAction, Action.WorkflowType == Parent {
-        return storage.render(context: context, key: key, outputMap: outputMap)
+    func render<Parent, Action>(context: RenderContext<Parent>, key: String, outputMap: @escaping (Output) -> Action) -> Rendering where Action: WorkflowAction, Action.WorkflowType == Parent {
+        storage.render(context: context, key: key, outputMap: outputMap)
     }
 }
 
@@ -137,7 +137,7 @@ extension AnyWorkflow {
         override var base: Any { workflow }
 
         override var workflowType: Any.Type {
-            return T.self
+            T.self
         }
 
         override func render<Parent, Action>(context: RenderContext<Parent>, key: String, outputMap: @escaping (Output) -> Action) -> Rendering where Action: WorkflowAction, Action.WorkflowType == Parent {
@@ -149,7 +149,7 @@ extension AnyWorkflow {
         }
 
         override func mapOutput<NewOutput>(transform: @escaping (Output) -> NewOutput) -> AnyWorkflow<Rendering, NewOutput>.AnyStorage {
-            return AnyWorkflow<Rendering, NewOutput>.Storage<T>(
+            AnyWorkflow<Rendering, NewOutput>.Storage<T>(
                 workflow: workflow,
                 renderingTransform: renderingTransform,
                 outputTransform: { [outputTransform] in
@@ -159,7 +159,7 @@ extension AnyWorkflow {
         }
 
         override func mapRendering<NewRendering>(transform: @escaping (Rendering) -> NewRendering) -> AnyWorkflow<NewRendering, Output>.AnyStorage {
-            return AnyWorkflow<NewRendering, Output>.Storage<T>(
+            AnyWorkflow<NewRendering, Output>.Storage<T>(
                 workflow: workflow,
                 renderingTransform: { [renderingTransform] in
                     transform(renderingTransform($0))
@@ -172,10 +172,10 @@ extension AnyWorkflow {
 
 extension AnyWorkflowConvertible {
     public func mapOutput<NewOutput>(_ transform: @escaping (Output) -> NewOutput) -> AnyWorkflow<Rendering, NewOutput> {
-        return asAnyWorkflow().mapOutput(transform)
+        asAnyWorkflow().mapOutput(transform)
     }
 
     public func mapRendering<NewRendering>(_ transform: @escaping (Rendering) -> NewRendering) -> AnyWorkflow<NewRendering, Output> {
-        return asAnyWorkflow().mapRendering(transform)
+        asAnyWorkflow().mapRendering(transform)
     }
 }
diff --git a/Workflow/Sources/AnyWorkflowConvertible.swift b/Workflow/Sources/AnyWorkflowConvertible.swift
index 6a78eed44..2de3f9869 100644
--- a/Workflow/Sources/AnyWorkflowConvertible.swift
+++ b/Workflow/Sources/AnyWorkflowConvertible.swift
@@ -38,15 +38,15 @@ extension AnyWorkflowConvertible {
     ///
     /// - Returns: The `Rendering` generated by the workflow.
     public func rendered<Parent>(in context: RenderContext<Parent>, key: String = "") -> Rendering where Output: WorkflowAction, Output.WorkflowType == Parent {
-        return asAnyWorkflow().render(context: context, key: key, outputMap: { $0 })
+        asAnyWorkflow().render(context: context, key: key, outputMap: { $0 })
     }
 
     public func rendered<Parent, Action>(in context: RenderContext<Parent>, key: String = "", outputMap: @escaping (Output) -> Action) -> Rendering where Action: WorkflowAction, Action.WorkflowType == Parent {
-        return asAnyWorkflow().render(context: context, key: key, outputMap: { outputMap($0) })
+        asAnyWorkflow().render(context: context, key: key, outputMap: { outputMap($0) })
     }
 
     public func rendered<Parent>(in context: RenderContext<Parent>, key: String = "") -> Rendering where Output == AnyWorkflowAction<Parent> {
-        return asAnyWorkflow().render(context: context, key: key, outputMap: { $0 })
+        asAnyWorkflow().render(context: context, key: key, outputMap: { $0 })
     }
 }
 
@@ -63,7 +63,7 @@ extension AnyWorkflowConvertible where Output == Never {
     public func rendered<T>(in context: RenderContext<T>, key: String = "") -> Rendering {
         // Convenience for workflow that have no output allowing them to be rendered with any context
 
-        return asAnyWorkflow()
+        asAnyWorkflow()
             .render(
                 context: context,
                 key: key,
@@ -91,7 +91,7 @@ extension AnyWorkflowConvertible {
     ///
     /// - Parameter apply: On `Output`, mutate `State` as necessary and return new `Output` (or `nil`).
     public func onOutput<Parent>(_ apply: @escaping ((inout Parent.State, Output) -> Parent.Output?)) -> AnyWorkflow<Rendering, AnyWorkflowAction<Parent>> {
-        return asAnyWorkflow()
+        asAnyWorkflow()
             .mapOutput { output in
                 AnyWorkflowAction { state -> Parent.Output? in
                     apply(&state, output)
@@ -117,7 +117,7 @@ struct OutputBlockingWorkflow<Child: AnyWorkflowConvertible>: Workflow {
     var child: Child
 
     func render(state: Void, context: RenderContext<OutputBlockingWorkflow<Child>>) -> Child.Rendering {
-        return child
+        child
             .mapOutput { _ in AnyWorkflowAction.noAction }
             .rendered(in: context)
     }
diff --git a/Workflow/Sources/Debugging.swift b/Workflow/Sources/Debugging.swift
index 3ab3e8c62..3fef6ebff 100644
--- a/Workflow/Sources/Debugging.swift
+++ b/Workflow/Sources/Debugging.swift
@@ -18,7 +18,7 @@ public struct WorkflowUpdateDebugInfo: Codable, Equatable {
     public var workflowType: String
     public var kind: Kind
 
-    internal init(workflowType: String, kind: Kind) {
+    init(workflowType: String, kind: Kind) {
         self.workflowType = workflowType
         self.kind = kind
     }
diff --git a/Workflow/Sources/RenderContext.swift b/Workflow/Sources/RenderContext.swift
index 9c6b1fda7..eb099a955 100644
--- a/Workflow/Sources/RenderContext.swift
+++ b/Workflow/Sources/RenderContext.swift
@@ -105,7 +105,7 @@ public class RenderContext<WorkflowType: Workflow>: RenderContextType {
 
     // API to allow custom context implementations to power a render context
     static func make<T: RenderContextType>(implementation: T) -> RenderContext<WorkflowType> where T.WorkflowType == WorkflowType {
-        return ConcreteRenderContext(implementation)
+        ConcreteRenderContext(implementation)
     }
 
     // Private subclass that forwards render calls to a wrapped implementation. This is the only `RenderContext` class
@@ -139,7 +139,7 @@ public class RenderContext<WorkflowType: Workflow>: RenderContextType {
     }
 }
 
-internal protocol RenderContextType: AnyObject {
+protocol RenderContextType: AnyObject {
     associatedtype WorkflowType: Workflow
 
     func render<Child, Action>(workflow: Child, key: String, outputMap: @escaping (Child.Output) -> Action) -> Child.Rendering where Child: Workflow, Action: WorkflowAction, Action.WorkflowType == WorkflowType
@@ -151,7 +151,7 @@ internal protocol RenderContextType: AnyObject {
 
 extension RenderContext {
     public func makeSink<Event>(of eventType: Event.Type, onEvent: @escaping (Event, inout WorkflowType.State) -> WorkflowType.Output?) -> Sink<Event> {
-        return makeSink(of: AnyWorkflowAction.self)
+        makeSink(of: AnyWorkflowAction.self)
             .contraMap { event in
                 AnyWorkflowAction<WorkflowType> { state in
                     onEvent(event, &state)
@@ -162,7 +162,7 @@ extension RenderContext {
     /// Generates a sink that allows sending the Workflow's output wrapped in an AnyWorkflowAction, allowing bypassing an
     /// intermediate action.
     public func makeOutputSink() -> Sink<WorkflowType.Output> {
-        return makeSink(of: AnyWorkflowAction.self)
+        makeSink(of: AnyWorkflowAction.self)
             .contraMap { AnyWorkflowAction<WorkflowType>(sendingOutput: $0) }
     }
 }
diff --git a/Workflow/Sources/Sink.swift b/Workflow/Sources/Sink.swift
index 573478345..1fd9ded0f 100644
--- a/Workflow/Sources/Sink.swift
+++ b/Workflow/Sources/Sink.swift
@@ -53,8 +53,8 @@ public struct Sink<Value> {
     ///
     /// - Parameter transform: An escaping closure that transforms `T` into `Event`.
     public func contraMap<NewValue>(_ transform: @escaping (NewValue) -> Value) -> Sink<NewValue> {
-        return Sink<NewValue> { value in
-            self.send(transform(value))
+        Sink<NewValue> { value in
+            send(transform(value))
         }
     }
 }
diff --git a/Workflow/Sources/SubtreeManager.swift b/Workflow/Sources/SubtreeManager.swift
index ca469a95f..64b143a3b 100644
--- a/Workflow/Sources/SubtreeManager.swift
+++ b/Workflow/Sources/SubtreeManager.swift
@@ -19,20 +19,20 @@ import Dispatch
 extension WorkflowNode {
     /// Manages the subtree of a workflow. Specifically, this type encapsulates the logic required to update and manage
     /// the lifecycle of nested workflows across multiple render passes.
-    internal final class SubtreeManager {
-        internal var onUpdate: ((Output) -> Void)?
+    final class SubtreeManager {
+        var onUpdate: ((Output) -> Void)?
 
         /// Sinks from the outside world (i.e. UI)
-        internal private(set) var eventPipes: [EventPipe] = []
+        private(set) var eventPipes: [EventPipe] = []
 
         /// Reusable sinks from the previous render pass
         private var previousSinks: [ObjectIdentifier: AnyReusableSink] = [:]
 
         /// The current array of children
-        internal private(set) var childWorkflows: [ChildKey: AnyChildWorkflow] = [:]
+        private(set) var childWorkflows: [ChildKey: AnyChildWorkflow] = [:]
 
         /// The current array of side-effects
-        internal private(set) var sideEffectLifetimes: [AnyHashable: SideEffectLifetime] = [:]
+        private(set) var sideEffectLifetimes: [AnyHashable: SideEffectLifetime] = [:]
 
         private let session: WorkflowSession
 
@@ -108,8 +108,8 @@ extension WorkflowNode {
         }
 
         func makeDebugSnapshot() -> [WorkflowHierarchyDebugSnapshot.Child] {
-            return childWorkflows
-                .sorted(by: { (lhs, rhs) -> Bool in
+            childWorkflows
+                .sorted(by: { lhs, rhs -> Bool in
                     lhs.key.key < rhs.key.key
                 })
                 .map {
@@ -138,20 +138,20 @@ extension WorkflowNode.SubtreeManager {
 extension WorkflowNode.SubtreeManager {
     /// The workflow context implementation used by the subtree manager.
     fileprivate final class Context: RenderContextType {
-        internal private(set) var eventPipes: [EventPipe]
+        private(set) var eventPipes: [EventPipe]
 
-        internal private(set) var sinkStore: SinkStore
+        private(set) var sinkStore: SinkStore
 
         private let originalChildWorkflows: [ChildKey: AnyChildWorkflow]
-        internal private(set) var usedChildWorkflows: [ChildKey: AnyChildWorkflow]
+        private(set) var usedChildWorkflows: [ChildKey: AnyChildWorkflow]
 
         private let originalSideEffectLifetimes: [AnyHashable: SideEffectLifetime]
-        internal private(set) var usedSideEffectLifetimes: [AnyHashable: SideEffectLifetime]
+        private(set) var usedSideEffectLifetimes: [AnyHashable: SideEffectLifetime]
 
         private let session: WorkflowSession
         private let observer: WorkflowObserver?
 
-        internal init(
+        init(
             previousSinks: [ObjectIdentifier: AnyReusableSink],
             originalChildWorkflows: [ChildKey: AnyChildWorkflow],
             originalSideEffectLifetimes: [AnyHashable: SideEffectLifetime],
@@ -179,7 +179,8 @@ extension WorkflowNode.SubtreeManager {
         ) -> Child.Rendering
             where Child: Workflow,
             Action: WorkflowAction,
-            WorkflowType == Action.WorkflowType {
+            WorkflowType == Action.WorkflowType
+        {
             /// A unique key used to identify this child workflow
             let childKey = ChildKey(childType: Child.self, key: key)
 
@@ -257,7 +258,7 @@ extension WorkflowNode.SubtreeManager {
 extension WorkflowNode.SubtreeManager {
     fileprivate struct SinkStore {
         var eventPipes: [EventPipe] {
-            return usedSinks.values.map { reusableSink -> EventPipe in
+            usedSinks.values.map { reusableSink -> EventPipe in
                 reusableSink.eventPipe
             }
         }
@@ -322,7 +323,7 @@ extension WorkflowNode.SubtreeManager {
 // MARK: - EventPipe
 
 extension WorkflowNode.SubtreeManager {
-    internal final class EventPipe {
+    final class EventPipe {
         var validationState: ValidationState
         enum ValidationState {
             case preparing
@@ -406,7 +407,7 @@ extension WorkflowNode.SubtreeManager {
         var childType: Any.Type
         var key: String
 
-        init<T>(childType: T.Type, key: String) {
+        init(childType: (some Any).Type, key: String) {
             self.childType = childType
             self.key = key
         }
@@ -417,7 +418,7 @@ extension WorkflowNode.SubtreeManager {
         }
 
         static func == (lhs: ChildKey, rhs: ChildKey) -> Bool {
-            return lhs.childType == rhs.childType
+            lhs.childType == rhs.childType
                 && lhs.key == rhs.key
         }
     }
@@ -427,7 +428,7 @@ extension WorkflowNode.SubtreeManager {
 
 extension WorkflowNode.SubtreeManager {
     /// Abstract base class for running children in the subtree.
-    internal class AnyChildWorkflow {
+    class AnyChildWorkflow {
         fileprivate var eventPipe: EventPipe
 
         fileprivate init(eventPipe: EventPipe) {
@@ -475,7 +476,7 @@ extension WorkflowNode.SubtreeManager {
         }
 
         func render() -> W.Rendering {
-            return node.render(isRootNode: false)
+            node.render(isRootNode: false)
         }
 
         func update(
@@ -489,22 +490,20 @@ extension WorkflowNode.SubtreeManager {
         }
 
         private func handle(workflowOutput: WorkflowNode<W>.Output) {
-            let output: Output
-
-            if let outputEvent = workflowOutput.outputEvent {
-                output = Output.update(
+            let output = if let outputEvent = workflowOutput.outputEvent {
+                Output.update(
                     outputMap(outputEvent),
                     source: .subtree(workflowOutput.debugInfo)
                 )
             } else {
-                output = Output.childDidUpdate(workflowOutput.debugInfo)
+                Output.childDidUpdate(workflowOutput.debugInfo)
             }
 
             eventPipe.handle(event: output)
         }
 
         override func makeDebugSnapshot() -> WorkflowHierarchyDebugSnapshot {
-            return node.makeDebugSnapshot()
+            node.makeDebugSnapshot()
         }
     }
 }
@@ -512,7 +511,7 @@ extension WorkflowNode.SubtreeManager {
 // MARK: - Side Effects
 
 extension WorkflowNode.SubtreeManager {
-    internal class SideEffectLifetime {
+    class SideEffectLifetime {
         fileprivate let lifetime: Lifetime
 
         fileprivate init() {
diff --git a/Workflow/Sources/Workflow.swift b/Workflow/Sources/Workflow.swift
index 3f3431ec3..fe62d8715 100644
--- a/Workflow/Sources/Workflow.swift
+++ b/Workflow/Sources/Workflow.swift
@@ -89,7 +89,7 @@ extension Workflow {
 /// implementations, making a “stateless workflow”.
 extension Workflow where State == Void {
     public func makeInitialState() -> State {
-        return ()
+        ()
     }
 
     public func workflowDidChange(from previousWorkflow: Self, state: inout State) {}
@@ -97,6 +97,6 @@ extension Workflow where State == Void {
 
 extension Workflow {
     public func asAnyWorkflow() -> AnyWorkflow<Rendering, Output> {
-        return AnyWorkflow(self)
+        AnyWorkflow(self)
     }
 }
diff --git a/Workflow/Sources/WorkflowAction.swift b/Workflow/Sources/WorkflowAction.swift
index 260eb2f92..9d7da0581 100644
--- a/Workflow/Sources/WorkflowAction.swift
+++ b/Workflow/Sources/WorkflowAction.swift
@@ -50,7 +50,7 @@ public struct AnyWorkflowAction<WorkflowType: Workflow>: WorkflowAction {
             self = anyEvent
             return
         }
-        self._apply = { return base.apply(toState: &$0) }
+        self._apply = { base.apply(toState: &$0) }
         self.base = base
         self.isClosureBased = false
     }
@@ -80,7 +80,7 @@ public struct AnyWorkflowAction<WorkflowType: Workflow>: WorkflowAction {
     }
 
     public func apply(toState state: inout WorkflowType.State) -> WorkflowType.Output? {
-        return _apply(&state)
+        _apply(&state)
     }
 }
 
@@ -97,7 +97,7 @@ extension AnyWorkflowAction {
     /// Creates a type-erased workflow action that does nothing (it leaves state unchanged and does not emit an output
     /// event).
     public static var noAction: AnyWorkflowAction<WorkflowType> {
-        return AnyWorkflowAction { state in
+        AnyWorkflowAction { state in
             nil
         }
     }
diff --git a/Workflow/Sources/WorkflowHost.swift b/Workflow/Sources/WorkflowHost.swift
index d170a2cc1..03c5adb49 100644
--- a/Workflow/Sources/WorkflowHost.swift
+++ b/Workflow/Sources/WorkflowHost.swift
@@ -37,7 +37,7 @@ public final class WorkflowHost<WorkflowType: Workflow> {
     private let (outputEvent, outputEventObserver) = Signal<WorkflowType.Output, Never>.pipe()
 
     // @testable
-    internal let rootNode: WorkflowNode<WorkflowType>
+    let rootNode: WorkflowNode<WorkflowType>
 
     private let mutableRendering: MutableProperty<WorkflowType.Rendering>
 
@@ -112,6 +112,6 @@ public final class WorkflowHost<WorkflowType: Workflow> {
 
     /// A signal containing output events emitted by the root workflow in the hierarchy.
     public var output: Signal<WorkflowType.Output, Never> {
-        return outputEvent
+        outputEvent
     }
 }
diff --git a/Workflow/Sources/WorkflowLogger.swift b/Workflow/Sources/WorkflowLogger.swift
index 8a4ae2641..1b47ee2fa 100644
--- a/Workflow/Sources/WorkflowLogger.swift
+++ b/Workflow/Sources/WorkflowLogger.swift
@@ -17,16 +17,14 @@
 import Foundation
 import os.signpost
 
-private extension OSLog {
+extension OSLog {
     /// Logging will use this log handle when enabled
-    static let workflow = OSLog(subsystem: "com.squareup.Workflow", category: "Workflow")
+    fileprivate static let workflow = OSLog(subsystem: "com.squareup.Workflow", category: "Workflow")
 
     /// The active log handle to use when logging. If `WorkflowLogging.osLoggingSupported` is
     /// `true`, defaults to the `workflow` handle, otherwise defaults to the shared `.disabled`
     /// handle.
-    static var active: OSLog = {
-        WorkflowLogging.isOSLoggingAllowed ? .workflow : .disabled
-    }()
+    fileprivate static var active: OSLog = WorkflowLogging.isOSLoggingAllowed ? .workflow : .disabled
 }
 
 // MARK: -
@@ -113,7 +111,7 @@ final class SignpostRef {
     init() {}
 }
 
-final class WorkflowLogger {
+enum WorkflowLogger {
     // MARK: Workflows
 
     static func logWorkflowStarted<WorkflowType>(ref: WorkflowNode<WorkflowType>) {
@@ -133,7 +131,7 @@ final class WorkflowLogger {
         )
     }
 
-    static func logWorkflowFinished<WorkflowType>(ref: WorkflowNode<WorkflowType>) {
+    static func logWorkflowFinished(ref: WorkflowNode<some Any>) {
         guard
             WorkflowLogging.isOSLoggingAllowed,
             WorkflowLogging.config.logLifetimes
@@ -181,8 +179,8 @@ final class WorkflowLogger {
         )
     }
 
-    static func logWorkflowFinishedRendering<WorkflowType>(
-        ref: WorkflowNode<WorkflowType>,
+    static func logWorkflowFinishedRendering(
+        ref: WorkflowNode<some Any>,
         isRootNode: Bool
     ) {
         guard shouldLogRenderTimings(
diff --git a/Workflow/Sources/WorkflowNode.swift b/Workflow/Sources/WorkflowNode.swift
index 36d47f551..ba6a650fb 100644
--- a/Workflow/Sources/WorkflowNode.swift
+++ b/Workflow/Sources/WorkflowNode.swift
@@ -162,7 +162,7 @@ final class WorkflowNode<WorkflowType: Workflow> {
     }
 
     func makeDebugSnapshot() -> WorkflowHierarchyDebugSnapshot {
-        return WorkflowHierarchyDebugSnapshot(
+        WorkflowHierarchyDebugSnapshot(
             workflowType: "\(WorkflowType.self)",
             stateDescription: "\(state)",
             children: subtreeManager.makeDebugSnapshot()
@@ -177,13 +177,13 @@ extension WorkflowNode {
     }
 }
 
-private extension WorkflowNode {
+extension WorkflowNode {
     /// Applies an appropriate `WorkflowAction` to advance the underlying Workflow `State`
     /// - Parameters:
     ///   - action: The `WorkflowAction` to apply
     ///   - isExternal: Whether the handled action came from the 'outside world' vs being bubbled up from a child node
     /// - Returns: An optional `Output` produced by the action application
-    func openAndApply<A: WorkflowAction>(
+    private func openAndApply<A: WorkflowAction>(
         _ action: A,
         isExternal: Bool
     ) -> WorkflowType.Output? where A.WorkflowType == WorkflowType {
diff --git a/Workflow/Sources/WorkflowObserver.swift b/Workflow/Sources/WorkflowObserver.swift
index 2cf7f0385..6a8125214 100644
--- a/Workflow/Sources/WorkflowObserver.swift
+++ b/Workflow/Sources/WorkflowObserver.swift
@@ -140,9 +140,9 @@ public struct WorkflowSession {
     public var parent: WorkflowSession? {
         switch _indirectParent {
         case .some(let parent):
-            return parent
+            parent
         case .none:
-            return nil
+            nil
         }
     }
 
@@ -165,41 +165,41 @@ public struct WorkflowSession {
 
 // MARK: - No-op Defaults
 
-public extension WorkflowObserver {
-    func sessionDidBegin(
+extension WorkflowObserver {
+    public func sessionDidBegin(
         _ session: WorkflowSession
     ) {}
 
-    func sessionDidEnd(
+    public func sessionDidEnd(
         _ session: WorkflowSession
     ) {}
 
-    func workflowDidMakeInitialState<WorkflowType: Workflow>(
+    public func workflowDidMakeInitialState<WorkflowType: Workflow>(
         _ workflow: WorkflowType,
         initialState: WorkflowType.State,
         session: WorkflowSession
     ) {}
 
-    func workflowWillRender<WorkflowType: Workflow>(
+    public func workflowWillRender<WorkflowType: Workflow>(
         _ workflow: WorkflowType,
         state: WorkflowType.State,
         session: WorkflowSession
     ) -> ((WorkflowType.Rendering) -> Void)? { nil }
 
-    func workflowDidChange<WorkflowType: Workflow>(
+    public func workflowDidChange<WorkflowType: Workflow>(
         from oldWorkflow: WorkflowType,
         to newWorkflow: WorkflowType,
         state: WorkflowType.State,
         session: WorkflowSession
     ) {}
 
-    func workflowDidReceiveAction<Action: WorkflowAction>(
+    public func workflowDidReceiveAction<Action: WorkflowAction>(
         _ action: Action,
         workflow: Action.WorkflowType,
         session: WorkflowSession
     ) {}
 
-    func workflowWillApplyAction<Action: WorkflowAction>(
+    public func workflowWillApplyAction<Action: WorkflowAction>(
         _ action: Action,
         workflow: Action.WorkflowType,
         state: Action.WorkflowType.State,
@@ -321,13 +321,13 @@ final class ChainedWorkflowObserver: WorkflowObserver {
     }
 }
 
-extension Array where Element == WorkflowObserver {
+extension [WorkflowObserver] {
     func chained() -> WorkflowObserver? {
         if count <= 1 {
             // no wrapping needed if empty or a single element
-            return first
+            first
         } else {
-            return ChainedWorkflowObserver(observers: self)
+            ChainedWorkflowObserver(observers: self)
         }
     }
 }
diff --git a/Workflow/Tests/AnyWorkflowActionTests.swift b/Workflow/Tests/AnyWorkflowActionTests.swift
index 5e3ab968c..d7dd25d11 100644
--- a/Workflow/Tests/AnyWorkflowActionTests.swift
+++ b/Workflow/Tests/AnyWorkflowActionTests.swift
@@ -109,7 +109,7 @@ private struct ExampleAction: WorkflowAction, Equatable {
     typealias WorkflowType = ExampleWorkflow
 
     func apply(toState state: inout WorkflowType.State) -> WorkflowType.Output? {
-        return nil
+        nil
     }
 }
 
diff --git a/Workflow/Tests/AnyWorkflowTests.swift b/Workflow/Tests/AnyWorkflowTests.swift
index e72a22f43..4c6d56aca 100644
--- a/Workflow/Tests/AnyWorkflowTests.swift
+++ b/Workflow/Tests/AnyWorkflowTests.swift
@@ -93,11 +93,11 @@ extension PassthroughWorkflow {
     struct State {}
 
     func makeInitialState() -> State {
-        return State()
+        State()
     }
 
     func render(state: State, context: RenderContext<PassthroughWorkflow<Rendering>>) -> Rendering {
-        return child.rendered(in: context)
+        child.rendered(in: context)
     }
 }
 
@@ -110,11 +110,11 @@ extension SimpleWorkflow {
     struct State {}
 
     func makeInitialState() -> State {
-        return State()
+        State()
     }
 
     func render(state: State, context: RenderContext<SimpleWorkflow>) -> String {
-        return String(string.reversed())
+        String(string.reversed())
     }
 }
 
diff --git a/Workflow/Tests/ConcurrencyTests.swift b/Workflow/Tests/ConcurrencyTests.swift
index 6f0f05905..8e71f9dbc 100644
--- a/Workflow/Tests/ConcurrencyTests.swift
+++ b/Workflow/Tests/ConcurrencyTests.swift
@@ -178,7 +178,7 @@ final class ConcurrencyTests: XCTestCase {
             }
 
             func makeInitialState() -> State {
-                return State(count: 0)
+                State(count: 0)
             }
 
             enum Action: WorkflowAction {
@@ -271,7 +271,7 @@ final class ConcurrencyTests: XCTestCase {
             }
 
             func makeInitialState() -> State {
-                return State(count: 0)
+                State(count: 0)
             }
 
             enum Action: WorkflowAction {
@@ -371,7 +371,7 @@ final class ConcurrencyTests: XCTestCase {
             }
 
             func makeInitialState() -> State {
-                return State(count: 0)
+                State(count: 0)
             }
 
             enum FirstAction: WorkflowAction {
@@ -480,12 +480,12 @@ final class ConcurrencyTests: XCTestCase {
             var signal: TestSignal
 
             var description: String {
-                return "\(count)"
+                "\(count)"
             }
         }
 
         func makeInitialState() -> State {
-            return State(count: 0, running: running, signal: signal)
+            State(count: 0, running: running, signal: signal)
         }
 
         enum Action: WorkflowAction {
@@ -513,6 +513,7 @@ final class ConcurrencyTests: XCTestCase {
             switch state.running {
             case .idle:
                 break
+
             case .signal:
                 context.runSideEffect(key: "signal1") { lifetime in
                     signal.signal
@@ -548,8 +549,8 @@ final class ConcurrencyTests: XCTestCase {
     }
 }
 
-private extension Lifetime {
-    var reactiveLifetime: ReactiveSwift.Lifetime {
+extension Lifetime {
+    fileprivate var reactiveLifetime: ReactiveSwift.Lifetime {
         let (lifetime, token) = ReactiveSwift.Lifetime.make()
         onEnded {
             token.dispose()
diff --git a/Workflow/Tests/PerformanceTests.swift b/Workflow/Tests/PerformanceTests.swift
index bbc7bfd25..c3ba54820 100644
--- a/Workflow/Tests/PerformanceTests.swift
+++ b/Workflow/Tests/PerformanceTests.swift
@@ -99,8 +99,8 @@ class PerformanceTests: XCTestCase {
     }
 }
 
-private extension PerformanceTests {
-    struct WideShallowParentWorkflow: Workflow {
+extension PerformanceTests {
+    fileprivate struct WideShallowParentWorkflow: Workflow {
         typealias State = Void
         typealias Rendering = Int
 
@@ -115,7 +115,7 @@ private extension PerformanceTests {
         }
     }
 
-    struct NarrowDeepParentWorkflow: Workflow {
+    fileprivate struct NarrowDeepParentWorkflow: Workflow {
         typealias State = Void
         typealias Rendering = Int
 
@@ -128,20 +128,18 @@ private extension PerformanceTests {
         }
     }
 
-    struct ChildWorkflow: Workflow {
+    fileprivate struct ChildWorkflow: Workflow {
         typealias State = Void
         typealias Rendering = Int
 
         var remainingChildren: UInt = 0
 
         func render(state: Void, context: RenderContext<ChildWorkflow>) -> Int {
-            let rendering: Int
-
-            if remainingChildren > 0 {
-                rendering = ChildWorkflow(remainingChildren: remainingChildren - 1)
+            let rendering: Int = if remainingChildren > 0 {
+                ChildWorkflow(remainingChildren: remainingChildren - 1)
                     .rendered(in: context)
             } else {
-                rendering = 42
+                42
             }
 
             return rendering
diff --git a/Workflow/Tests/SubtreeManagerTests.swift b/Workflow/Tests/SubtreeManagerTests.swift
index 5e8d86e83..41ecea140 100644
--- a/Workflow/Tests/SubtreeManagerTests.swift
+++ b/Workflow/Tests/SubtreeManagerTests.swift
@@ -58,7 +58,7 @@ final class SubtreeManagerTests: XCTestCase {
 
         XCTAssertEqual(manager.childWorkflows.count, 1)
 
-        manager.render { context -> Void in
+        manager.render { context in
         }
 
         XCTAssertTrue(manager.childWorkflows.isEmpty)
@@ -276,7 +276,7 @@ private struct ParentWorkflow: Workflow {
     typealias Output = Never
 
     func makeInitialState() -> State {
-        return State()
+        State()
     }
 
     func render(state: State, context: RenderContext<ParentWorkflow>) -> Never {
@@ -315,7 +315,7 @@ private struct TestWorkflow: Workflow {
     }
 
     func makeInitialState() -> State {
-        return .foo
+        .foo
     }
 
     func render(state: State, context: RenderContext<TestWorkflow>) -> TestViewModel {
@@ -330,8 +330,8 @@ private struct TestWorkflow: Workflow {
 
 // MARK: Testing conveniences
 
-private extension WorkflowSession {
-    static func testing() -> WorkflowSession {
+extension WorkflowSession {
+    fileprivate static func testing() -> WorkflowSession {
         struct SessionTestWorkflow: Workflow {
             typealias State = Void
             typealias Rendering = Void
@@ -349,8 +349,8 @@ private extension WorkflowSession {
     }
 }
 
-private extension WorkflowNode.SubtreeManager {
-    convenience init() {
+extension WorkflowNode.SubtreeManager {
+    fileprivate convenience init() {
         self.init(
             session: .testing(),
             observer: nil
diff --git a/Workflow/Tests/TestUtilities.swift b/Workflow/Tests/TestUtilities.swift
index 8c7b7077d..d2e40d768 100644
--- a/Workflow/Tests/TestUtilities.swift
+++ b/Workflow/Tests/TestUtilities.swift
@@ -29,7 +29,7 @@ struct StateTransitioningWorkflow: Workflow {
     }
 
     func makeInitialState() -> Bool {
-        return false
+        false
     }
 
     func render(state: State, context: RenderContext<StateTransitioningWorkflow>) -> Rendering {
diff --git a/Workflow/Tests/WorkflowHostTests.swift b/Workflow/Tests/WorkflowHostTests.swift
index 7a0dac636..d77b885a5 100644
--- a/Workflow/Tests/WorkflowHostTests.swift
+++ b/Workflow/Tests/WorkflowHostTests.swift
@@ -37,7 +37,7 @@ final class WorkflowHostTests: XCTestCase {
 
         struct State {}
         func makeInitialState() -> State {
-            return State()
+            State()
         }
 
         typealias Rendering = Int
@@ -45,9 +45,9 @@ final class WorkflowHostTests: XCTestCase {
         func render(state: State, context: RenderContext<TestWorkflow>) -> Rendering {
             switch step {
             case .first:
-                return 1
+                1
             case .second:
-                return 2
+                2
             }
         }
     }
@@ -151,7 +151,7 @@ extension WorkflowHost_EventEmissionTests {
             case eventOccurred
 
             func apply(toState state: inout Void) -> Child.Output? {
-                return .eventOccurred
+                .eventOccurred
             }
         }
     }
diff --git a/Workflow/Tests/WorkflowNodeTests.swift b/Workflow/Tests/WorkflowNodeTests.swift
index 74c845bd7..1124a4582 100644
--- a/Workflow/Tests/WorkflowNodeTests.swift
+++ b/Workflow/Tests/WorkflowNodeTests.swift
@@ -241,7 +241,8 @@ final class WorkflowNodeTests: XCTestCase {
 /// Renders two child state machines of types `A` and `B`.
 private struct CompositeWorkflow<A, B>: Workflow where
     A: Workflow,
-    B: Workflow {
+    B: Workflow
+{
     var a: A
     var b: B
 }
@@ -268,19 +269,19 @@ extension CompositeWorkflow {
         func apply(toState state: inout CompositeWorkflow<A, B>.State) -> CompositeWorkflow<A, B>.Output? {
             switch self {
             case .a(let childOutput):
-                return .childADidSomething(childOutput)
+                .childADidSomething(childOutput)
             case .b(let childOutput):
-                return .childBDidSomething(childOutput)
+                .childBDidSomething(childOutput)
             }
         }
     }
 
     func makeInitialState() -> CompositeWorkflow<A, B>.State {
-        return State()
+        State()
     }
 
     func render(state: State, context: RenderContext<CompositeWorkflow<A, B>>) -> Rendering {
-        return Rendering(
+        Rendering(
             aRendering: a
                 .mapOutput { Event.a($0) }
                 .rendered(in: context, key: "a"),
@@ -293,7 +294,7 @@ extension CompositeWorkflow {
 
 extension CompositeWorkflow.Rendering: Equatable where A.Rendering: Equatable, B.Rendering: Equatable {
     fileprivate static func == (lhs: CompositeWorkflow.Rendering, rhs: CompositeWorkflow.Rendering) -> Bool {
-        return lhs.aRendering == rhs.aRendering
+        lhs.aRendering == rhs.aRendering
             && lhs.bRendering == rhs.bRendering
     }
 }
@@ -302,11 +303,11 @@ extension CompositeWorkflow.Output: Equatable where A.Output: Equatable, B.Outpu
     fileprivate static func == (lhs: CompositeWorkflow.Output, rhs: CompositeWorkflow.Output) -> Bool {
         switch (lhs, rhs) {
         case (.childADidSomething(let l), .childADidSomething(let r)):
-            return l == r
+            l == r
         case (.childBDidSomething(let l), .childBDidSomething(let r)):
-            return l == r
+            l == r
         default:
-            return false
+            false
         }
     }
 }
@@ -318,11 +319,11 @@ private struct SimpleWorkflow: Workflow {
     struct State {}
 
     func makeInitialState() -> State {
-        return State()
+        State()
     }
 
     func render(state: State, context: RenderContext<SimpleWorkflow>) -> String {
-        return String(string.reversed())
+        String(string.reversed())
     }
 }
 
@@ -339,7 +340,7 @@ extension EventEmittingWorkflow {
     }
 
     func makeInitialState() -> State {
-        return State()
+        State()
     }
 
     enum Event: Equatable, WorkflowAction {
@@ -350,7 +351,7 @@ extension EventEmittingWorkflow {
         func apply(toState state: inout EventEmittingWorkflow.State) -> EventEmittingWorkflow.Output? {
             switch self {
             case .tapped:
-                return .helloWorld
+                .helloWorld
             }
         }
     }
diff --git a/Workflow/Tests/WorkflowObserverTests.swift b/Workflow/Tests/WorkflowObserverTests.swift
index 3bd620e84..2d511a773 100644
--- a/Workflow/Tests/WorkflowObserverTests.swift
+++ b/Workflow/Tests/WorkflowObserverTests.swift
@@ -660,7 +660,7 @@ private struct Child: Workflow {
     var prop: String
 
     func render(state: Void, context: RenderContext<Child>) -> String {
-        return prop
+        prop
     }
 }
 
@@ -686,7 +686,7 @@ private struct InjectableWorkflow: Workflow {
         case forwardedOutput
 
         func apply(toState state: inout ()) -> InjectableWorkflow.Output? {
-            return .forwardedOutput
+            .forwardedOutput
         }
     }
 
@@ -697,10 +697,10 @@ private struct InjectableWorkflow: Workflow {
     }
 }
 
-private extension WorkflowSession {
-    var workflowTypeString: String { String(describing: workflowType) }
+extension WorkflowSession {
+    fileprivate var workflowTypeString: String { String(describing: workflowType) }
 
-    static var testingSession: Self {
+    fileprivate static var testingSession: Self {
         WorkflowSession(
             workflow: Parent(),
             renderKey: "",
@@ -730,7 +730,7 @@ private struct VoidStateWorkflow: Workflow {
         case actionValue
 
         func apply(toState state: inout VoidStateWorkflow.State) -> VoidStateWorkflow.Output? {
-            return nil
+            nil
         }
     }
 
diff --git a/WorkflowCombine/Sources/Logger.swift b/WorkflowCombine/Sources/Logger.swift
index 377d0342e..d0235e89d 100644
--- a/WorkflowCombine/Sources/Logger.swift
+++ b/WorkflowCombine/Sources/Logger.swift
@@ -17,8 +17,8 @@
 import os.signpost
 @_spi(Logging) import Workflow
 
-private extension OSLog {
-    static let worker = OSLog(subsystem: "com.squareup.WorkflowCombine", category: "Worker")
+extension OSLog {
+    fileprivate static let worker = OSLog(subsystem: "com.squareup.WorkflowCombine", category: "Worker")
 }
 
 /// Logs Worker events to OSLog
diff --git a/WorkflowCombine/Sources/Publisher+Extensions.swift b/WorkflowCombine/Sources/Publisher+Extensions.swift
index 0fa116986..b65cf7ea1 100644
--- a/WorkflowCombine/Sources/Publisher+Extensions.swift
+++ b/WorkflowCombine/Sources/Publisher+Extensions.swift
@@ -17,7 +17,8 @@ import Workflow
 /// this solutions makes it so that all publishers can render its view.
 extension Publisher where Failure == Never {
     public func running<Parent>(in context: RenderContext<Parent>, key: String = "") where
-        Output == AnyWorkflowAction<Parent> {
+        Output == AnyWorkflowAction<Parent>
+    {
         asAnyWorkflow().rendered(in: context, key: key, outputMap: { $0 })
     }
 
diff --git a/WorkflowCombine/Testing/PublisherTesting.swift b/WorkflowCombine/Testing/PublisherTesting.swift
index 89d204fa4..9968b8997 100644
--- a/WorkflowCombine/Testing/PublisherTesting.swift
+++ b/WorkflowCombine/Testing/PublisherTesting.swift
@@ -22,7 +22,7 @@ import WorkflowTesting
 import XCTest
 @testable import WorkflowCombine
 
-public extension RenderTester {
+extension RenderTester {
     /// Expect a `Publisher`-based Workflow.
     ///
     /// `PublisherWorkflow` is used to subscribe to `Publisher`s.
@@ -31,7 +31,7 @@ public extension RenderTester {
     ///   - publisher: Type of the Publisher-based Workflow to expect
     ///   - producingOutput: An output that will be returned when this worker is requested, if any.
     ///   - key: Key to expect this `Workflow` to be rendered with.
-    func expect<PublisherType: Publisher>(
+    public func expect<PublisherType: Publisher>(
         publisher: PublisherType.Type,
         producingOutput output: PublisherType.Output? = nil,
         key: String = ""
@@ -46,7 +46,7 @@ public extension RenderTester {
     }
 
     @available(*, deprecated, renamed: "expect(publisher:producingOutput:key:)")
-    func expect<PublisherType: Publisher>(
+    public func expect<PublisherType: Publisher>(
         publisher: PublisherType.Type,
         output: PublisherType.Output,
         key: String = ""
diff --git a/WorkflowCombine/Testing/WorkerTesting.swift b/WorkflowCombine/Testing/WorkerTesting.swift
index 5525c13f0..eefa2c448 100644
--- a/WorkflowCombine/Testing/WorkerTesting.swift
+++ b/WorkflowCombine/Testing/WorkerTesting.swift
@@ -20,14 +20,14 @@ import WorkflowTesting
 import XCTest
 @testable import WorkflowCombine
 
-public extension RenderTester {
+extension RenderTester {
     /// Expect the given worker. It will be checked for `isEquivalent(to:)` with the requested worker.
     ///
     /// - Parameters:
     ///   - worker: The worker to be expected
     ///   - producingOutput: An output that will be returned when this worker is requested, if any.
     ///   - key: Key to expect this `Workflow` to be rendered with.
-    func expect<ExpectedWorkerType: Worker>(
+    public func expect<ExpectedWorkerType: Worker>(
         worker: ExpectedWorkerType,
         producingOutput output: ExpectedWorkerType.Output? = nil,
         key: String = "",
diff --git a/WorkflowCombine/TestingTests/TestingTests.swift b/WorkflowCombine/TestingTests/TestingTests.swift
index 7c6c0a2e9..d9326c6ce 100644
--- a/WorkflowCombine/TestingTests/TestingTests.swift
+++ b/WorkflowCombine/TestingTests/TestingTests.swift
@@ -91,7 +91,7 @@ class WorkflowCombineTestingTests: XCTestCase {
         file: StaticString = #file, line: UInt = #line,
         perform: () -> Result
     ) -> Result {
-        return expectingFailures([messageSubstring], file: file, line: line, perform: perform)
+        expectingFailures([messageSubstring], file: file, line: line, perform: perform)
     }
 
     @discardableResult
diff --git a/WorkflowCombine/Tests/WorkerTests.swift b/WorkflowCombine/Tests/WorkerTests.swift
index f1cf8a3cf..96fc5e1a9 100644
--- a/WorkflowCombine/Tests/WorkerTests.swift
+++ b/WorkflowCombine/Tests/WorkerTests.swift
@@ -91,11 +91,11 @@ class WorkerTests: XCTestCase {
                     Just(())
                         .handleEvents(
                             receiveSubscription: { _ in
-                                self.startExpectation.fulfill()
+                                startExpectation.fulfill()
 
                             },
                             receiveCompletion: { _ in
-                                self.endExpectation.fulfill()
+                                endExpectation.fulfill()
                             }
                         )
                         .eraseToAnyPublisher()
diff --git a/WorkflowConcurrency/Sources/AsyncOperationWorker.swift b/WorkflowConcurrency/Sources/AsyncOperationWorker.swift
index 94526807d..a538a77f5 100644
--- a/WorkflowConcurrency/Sources/AsyncOperationWorker.swift
+++ b/WorkflowConcurrency/Sources/AsyncOperationWorker.swift
@@ -51,12 +51,12 @@ public struct AsyncOperationWorker<OutputType>: Worker {
     }
 
     public func run() async -> OutputType {
-        return await operation()
+        await operation()
     }
 
     public typealias Output = OutputType
 
     public func isEquivalent(to otherWorker: AsyncOperationWorker) -> Bool {
-        return true
+        true
     }
 }
diff --git a/WorkflowConcurrency/Sources/Logger.swift b/WorkflowConcurrency/Sources/Logger.swift
index 2935d231c..7c401eecf 100644
--- a/WorkflowConcurrency/Sources/Logger.swift
+++ b/WorkflowConcurrency/Sources/Logger.swift
@@ -17,8 +17,8 @@
 import os.signpost
 @_spi(Logging) import Workflow
 
-private extension OSLog {
-    static let worker = OSLog(subsystem: "com.squareup.WorkflowConcurrency", category: "Worker")
+extension OSLog {
+    fileprivate static let worker = OSLog(subsystem: "com.squareup.WorkflowConcurrency", category: "Worker")
 }
 
 // Logs Worker events to OSLog
diff --git a/WorkflowConcurrency/Sources/Worker.swift b/WorkflowConcurrency/Sources/Worker.swift
index 4112b70e5..c0695086d 100644
--- a/WorkflowConcurrency/Sources/Worker.swift
+++ b/WorkflowConcurrency/Sources/Worker.swift
@@ -63,7 +63,7 @@ struct WorkerWorkflow<WorkerType: Worker>: Workflow {
         let logger = WorkerLogger<WorkerType>()
         let sink = context.makeOutputSink()
         context.runSideEffect(key: state) { lifetime in
-            let send: @MainActor(Output) -> Void = sink.send
+            let send: @MainActor (Output) -> Void = sink.send
             let task = Task(priority: .high) {
                 logger.logStarted()
                 let output = await worker.run()
diff --git a/WorkflowConcurrency/Testing/WorkerTesting.swift b/WorkflowConcurrency/Testing/WorkerTesting.swift
index 6e77f87eb..06cc378cd 100644
--- a/WorkflowConcurrency/Testing/WorkerTesting.swift
+++ b/WorkflowConcurrency/Testing/WorkerTesting.swift
@@ -20,14 +20,14 @@ import WorkflowTesting
 import XCTest
 @testable import WorkflowConcurrency
 
-public extension RenderTester {
+extension RenderTester {
     /// Expect the given worker. It will be checked for `isEquivalent(to:)` with the requested worker.
     ///
     /// - Parameters:
     ///   - worker: The worker to be expected
     ///   - producingOutput: An output that will be returned when this worker is requested, if any.
     ///   - key: Key to expect this `Workflow` to be rendered with.
-    func expect<ExpectedWorkerType: Worker>(
+    public func expect<ExpectedWorkerType: Worker>(
         worker: ExpectedWorkerType,
         producingOutput output: ExpectedWorkerType.Output? = nil,
         key: String = "",
diff --git a/WorkflowConcurrency/TestingTests/TestingTests.swift b/WorkflowConcurrency/TestingTests/TestingTests.swift
index ea16f282d..7d3acbf15 100644
--- a/WorkflowConcurrency/TestingTests/TestingTests.swift
+++ b/WorkflowConcurrency/TestingTests/TestingTests.swift
@@ -90,7 +90,7 @@ class WorkflowConcurrencyTestingTests: XCTestCase {
         file: StaticString = #file, line: UInt = #line,
         perform: () -> Result
     ) -> Result {
-        return expectingFailures([messageSubstring], file: file, line: line, perform: perform)
+        expectingFailures([messageSubstring], file: file, line: line, perform: perform)
     }
 
     @discardableResult
@@ -173,7 +173,7 @@ private struct TestWorker: Worker {
     let input: String
 
     func run() async -> String {
-        return input
+        input
     }
 
     func isEquivalent(to otherWorker: TestWorker) -> Bool { input == otherWorker.input }
diff --git a/WorkflowConcurrency/Tests/AsyncOperationWorkerTests.swift b/WorkflowConcurrency/Tests/AsyncOperationWorkerTests.swift
index 4dc68bb39..8156eea55 100644
--- a/WorkflowConcurrency/Tests/AsyncOperationWorkerTests.swift
+++ b/WorkflowConcurrency/Tests/AsyncOperationWorkerTests.swift
@@ -96,7 +96,7 @@ final class AsyncOperationWorkerTests: XCTestCase {
                 }
             }
 
-            func asyncOperation(startExpectation: XCTestExpectation, endExpectation: XCTestExpectation) async -> Void {
+            func asyncOperation(startExpectation: XCTestExpectation, endExpectation: XCTestExpectation) async {
                 startExpectation.fulfill()
                 for _ in 1 ... 200 {
                     if Task.isCancelled {
@@ -147,6 +147,6 @@ private struct TestAsyncOperationWorkerWorkflow: Workflow {
     }
 
     func outputOne() async -> Int {
-        return 1
+        1
     }
 }
diff --git a/WorkflowConcurrency/Tests/WorkerTests.swift b/WorkflowConcurrency/Tests/WorkerTests.swift
index b9010da83..c969ff103 100644
--- a/WorkflowConcurrency/Tests/WorkerTests.swift
+++ b/WorkflowConcurrency/Tests/WorkerTests.swift
@@ -61,7 +61,7 @@ class WorkerTests: XCTestCase {
         XCTAssertEqual(1, host.rendering.value)
 
         disposable?.dispose()
-        
+
         expectation = XCTestExpectation()
         // Set to observe renderings
         // This expectation should be called after the workflow is updated.
@@ -78,7 +78,7 @@ class WorkerTests: XCTestCase {
         wait(for: [expectation], timeout: 1.0)
         // Test to make sure the rendering matches the initial state.
         XCTAssertEqual(7, host.rendering.value)
-        
+
         expectation = XCTestExpectation()
         // Set to observe renderings
         // This expectation should be called when the worker runs.
@@ -92,7 +92,7 @@ class WorkerTests: XCTestCase {
         // Check to make sure the rendering is correct.
         XCTAssertEqual(8, host.rendering.value)
     }
-    
+
     func testWorkflowKeyChange() {
         // Create the workflow which causes the TaskTestWorker to run.
         let host = WorkflowHost(
@@ -116,7 +116,7 @@ class WorkerTests: XCTestCase {
         XCTAssertEqual(1, host.rendering.value)
 
         disposable?.dispose()
-        
+
         expectation = XCTestExpectation()
         // Set to observe renderings
         // This expectation should be called after the workflow is updated.
@@ -134,7 +134,7 @@ class WorkerTests: XCTestCase {
         // Test to make sure the rendering matches the existing state
         // since the inititalState didn't change.
         XCTAssertEqual(1, host.rendering.value)
-        
+
         expectation = XCTestExpectation()
         // Set to observe renderings
         // This expectation should be called when the worker runs.
@@ -149,7 +149,7 @@ class WorkerTests: XCTestCase {
         // The worker adds one to the initialState so this should be 1.
         XCTAssertEqual(1, host.rendering.value)
     }
-    
+
     func testExpectedWorker() {
         TaskTestWorkerWorkflow(key: "123", initialState: 0)
             .renderTester()
@@ -199,7 +199,7 @@ class WorkerTests: XCTestCase {
                 let startExpectation: XCTestExpectation
                 let endExpectation: XCTestExpectation
 
-                func run() async -> Void {
+                func run() async {
                     startExpectation.fulfill()
                     for _ in 1 ... 200 {
                         if Task.isCancelled {
@@ -253,7 +253,7 @@ private struct TaskTestWorkerWorkflow: Workflow {
             .running(in: context, key: key)
         return state
     }
-    
+
     func workflowDidChange(from previousWorkflow: TaskTestWorkerWorkflow, state: inout Int) {
         if previousWorkflow.initialState != initialState {
             state = initialState
@@ -264,7 +264,7 @@ private struct TaskTestWorkerWorkflow: Workflow {
 private struct TaskTestWorker: Worker {
     typealias Output = Int
     let initialState: Int
-    
+
     func run() async -> Int {
         do {
             try await Task.sleep(nanoseconds: 10000000)
@@ -274,6 +274,6 @@ private struct TaskTestWorker: Worker {
     }
 
     func isEquivalent(to otherWorker: TaskTestWorker) -> Bool {
-        return otherWorker.initialState == initialState
+        otherWorker.initialState == initialState
     }
 }
diff --git a/WorkflowReactiveSwift/Sources/Logger.swift b/WorkflowReactiveSwift/Sources/Logger.swift
index a30da572a..5e4b5b70c 100644
--- a/WorkflowReactiveSwift/Sources/Logger.swift
+++ b/WorkflowReactiveSwift/Sources/Logger.swift
@@ -30,12 +30,10 @@ extension WorkerLogging {
     }
 }
 
-private extension OSLog {
-    static let worker = OSLog(subsystem: "com.squareup.WorkflowReactiveSwift", category: "Worker")
+extension OSLog {
+    fileprivate static let worker = OSLog(subsystem: "com.squareup.WorkflowReactiveSwift", category: "Worker")
 
-    static var active: OSLog = {
-        WorkflowLogging.isOSLoggingAllowed ? .worker : .disabled
-    }()
+    fileprivate static var active: OSLog = WorkflowLogging.isOSLoggingAllowed ? .worker : .disabled
 }
 
 // MARK: -
diff --git a/WorkflowReactiveSwift/Sources/QueueScheduler+Workflow.swift b/WorkflowReactiveSwift/Sources/QueueScheduler+Workflow.swift
index 974634493..c363ec994 100644
--- a/WorkflowReactiveSwift/Sources/QueueScheduler+Workflow.swift
+++ b/WorkflowReactiveSwift/Sources/QueueScheduler+Workflow.swift
@@ -20,7 +20,7 @@ import ReactiveSwift
 @_spi(WorkflowInternals) import Workflow
 
 extension QueueScheduler {
-    static let workflowExecution: QueueScheduler = QueueScheduler(
+    static let workflowExecution: QueueScheduler = .init(
         qos: .userInteractive,
         name: "com.squareup.workflow",
         targeting: DispatchQueue.workflowExecution
diff --git a/WorkflowReactiveSwift/Sources/SignalProducerWorkflow.swift b/WorkflowReactiveSwift/Sources/SignalProducerWorkflow.swift
index 9d100f6ca..a52101cad 100644
--- a/WorkflowReactiveSwift/Sources/SignalProducerWorkflow.swift
+++ b/WorkflowReactiveSwift/Sources/SignalProducerWorkflow.swift
@@ -38,7 +38,7 @@ import class Workflow.Lifetime
 /// ```
 extension SignalProducer: AnyWorkflowConvertible where Error == Never {
     public func asAnyWorkflow() -> AnyWorkflow<Void, Value> {
-        return SignalProducerWorkflow(signalProducer: self).asAnyWorkflow()
+        SignalProducerWorkflow(signalProducer: self).asAnyWorkflow()
     }
 }
 
@@ -74,8 +74,8 @@ struct SignalProducerWorkflow<Value>: Workflow {
     }
 }
 
-private extension Lifetime {
-    var reactiveLifetime: ReactiveSwift.Lifetime {
+extension Lifetime {
+    fileprivate var reactiveLifetime: ReactiveSwift.Lifetime {
         let (lifetime, token) = ReactiveSwift.Lifetime.make()
         onEnded {
             token.dispose()
diff --git a/WorkflowReactiveSwift/Sources/SignalWorker.swift b/WorkflowReactiveSwift/Sources/SignalWorker.swift
index 018feae46..57822e649 100644
--- a/WorkflowReactiveSwift/Sources/SignalWorker.swift
+++ b/WorkflowReactiveSwift/Sources/SignalWorker.swift
@@ -37,6 +37,6 @@ import Workflow
 /// ```
 extension Signal: AnyWorkflowConvertible where Error == Never {
     public func asAnyWorkflow() -> AnyWorkflow<Void, Value> {
-        return SignalProducerWorkflow(signalProducer: SignalProducer(self)).asAnyWorkflow()
+        SignalProducerWorkflow(signalProducer: SignalProducer(self)).asAnyWorkflow()
     }
 }
diff --git a/WorkflowReactiveSwift/Sources/Worker.swift b/WorkflowReactiveSwift/Sources/Worker.swift
index 1360a70a5..e62353209 100644
--- a/WorkflowReactiveSwift/Sources/Worker.swift
+++ b/WorkflowReactiveSwift/Sources/Worker.swift
@@ -67,7 +67,7 @@ struct WorkerWorkflow<WorkerType: Worker>: Workflow {
 
         // Start with Void to ensure `worker.run()` is called only once for a given key
         SignalProducer(value: ())
-            .flatMap(.latest) { self.worker.run() }
+            .flatMap(.latest) { worker.run() }
             .on(
                 started: { logger.logStarted() },
                 event: { logger.log(event: $0) }
@@ -77,8 +77,8 @@ struct WorkerWorkflow<WorkerType: Worker>: Workflow {
     }
 }
 
-private extension WorkerLogger {
-    func log(event: SignalProducer<WorkerType.Output, Never>.ProducedSignal.Event) {
+extension WorkerLogger {
+    fileprivate func log(event: SignalProducer<WorkerType.Output, Never>.ProducedSignal.Event) {
         switch event {
         case .completed:
             logFinished(status: "Completed")
diff --git a/WorkflowReactiveSwift/Testing/SignalProducerWorkflowTesting.swift b/WorkflowReactiveSwift/Testing/SignalProducerWorkflowTesting.swift
index d52c5fc89..b80706c72 100644
--- a/WorkflowReactiveSwift/Testing/SignalProducerWorkflowTesting.swift
+++ b/WorkflowReactiveSwift/Testing/SignalProducerWorkflowTesting.swift
@@ -20,7 +20,7 @@ import WorkflowTesting
 import XCTest
 @testable import WorkflowReactiveSwift
 
-public extension RenderTester {
+extension RenderTester {
     /// Expect a `SignalProducer` with an optional output.
     ///
     /// `SignalProducerWorkflow` is used to subscribe to `SignalProducer`s and `Signal`s.
@@ -31,7 +31,7 @@ public extension RenderTester {
     ///   - outputType: The `OutputType` of the expected `SignalProducerWorkflow`. Typically this will be correctly inferred by the type system, but may need to be explicitly specified if particular optionality is desired.
     ///   - producingOutput: An output that will be returned when this worker is requested, if any.
     ///   - key: Key to expect this `Workflow` to be rendered with.
-    func expectSignalProducer<OutputType>(
+    public func expectSignalProducer<OutputType>(
         outputType: OutputType.Type = OutputType.self,
         producingOutput: OutputType? = nil,
         key: String = "",
diff --git a/WorkflowReactiveSwift/Testing/WorkerTesting.swift b/WorkflowReactiveSwift/Testing/WorkerTesting.swift
index 4a51eddee..5463d7015 100644
--- a/WorkflowReactiveSwift/Testing/WorkerTesting.swift
+++ b/WorkflowReactiveSwift/Testing/WorkerTesting.swift
@@ -20,14 +20,14 @@ import WorkflowTesting
 import XCTest
 @testable import WorkflowReactiveSwift
 
-public extension RenderTester {
+extension RenderTester {
     /// Expect the given worker. It will be checked for `isEquivalent(to:)` with the requested worker.
     ///
     /// - Parameters:
     ///   - worker: The worker to be expected
     ///   - producingOutput: An output that will be returned when this worker is requested, if any.
     ///   - key: Key to expect this `Workflow` to be rendered with.
-    func expect<ExpectedWorkerType: Worker>(
+    public func expect<ExpectedWorkerType: Worker>(
         worker: ExpectedWorkerType,
         producingOutput output: ExpectedWorkerType.Output? = nil,
         key: String = "",
diff --git a/WorkflowReactiveSwift/TestingTests/TestingTests.swift b/WorkflowReactiveSwift/TestingTests/TestingTests.swift
index 0369dedc2..31600e2c1 100644
--- a/WorkflowReactiveSwift/TestingTests/TestingTests.swift
+++ b/WorkflowReactiveSwift/TestingTests/TestingTests.swift
@@ -91,7 +91,7 @@ class WorkflowReactiveSwiftTestingTests: XCTestCase {
         file: StaticString = #file, line: UInt = #line,
         perform: () -> Result
     ) -> Result {
-        return expectingFailures([messageSubstring], file: file, line: line, perform: perform)
+        expectingFailures([messageSubstring], file: file, line: line, perform: perform)
     }
 
     @discardableResult
@@ -172,7 +172,7 @@ private struct TestWorker: Worker {
     let input: String
 
     func run() -> SignalProducer<String, Never> {
-        return SignalProducer(value: input)
+        SignalProducer(value: input)
     }
 
     func isEquivalent(to otherWorker: TestWorker) -> Bool {
diff --git a/WorkflowReactiveSwift/Tests/SignalProducerTests.swift b/WorkflowReactiveSwift/Tests/SignalProducerTests.swift
index 0c8c84cec..30c84cf36 100644
--- a/WorkflowReactiveSwift/Tests/SignalProducerTests.swift
+++ b/WorkflowReactiveSwift/Tests/SignalProducerTests.swift
@@ -74,7 +74,7 @@ class SignalProducerTests: XCTestCase {
         let signalProducer = SignalProducer(values: 1, 2, 3)
             .on(disposed: {
                 expectation.fulfill()
-        })
+            })
 
         let host = WorkflowHost(
             workflow: SignalProducerWorkflow(signalProducer: signalProducer)
diff --git a/WorkflowReactiveSwift/Tests/WorkerTests.swift b/WorkflowReactiveSwift/Tests/WorkerTests.swift
index e9a1464f9..a18b60b52 100644
--- a/WorkflowReactiveSwift/Tests/WorkerTests.swift
+++ b/WorkflowReactiveSwift/Tests/WorkerTests.swift
@@ -91,10 +91,10 @@ class WorkerTests: XCTestCase {
                 func run() -> SignalProducer<Void, Never> {
                     SignalProducer<Void, Never> { observer, lifetime in
                         lifetime.observeEnded {
-                            self.endExpectation.fulfill()
+                            endExpectation.fulfill()
                         }
 
-                        self.startExpectation.fulfill()
+                        startExpectation.fulfill()
                     }
                 }
 
diff --git a/WorkflowRxSwift/Sources/Logger.swift b/WorkflowRxSwift/Sources/Logger.swift
index 03d544ccc..ceb2d7198 100644
--- a/WorkflowRxSwift/Sources/Logger.swift
+++ b/WorkflowRxSwift/Sources/Logger.swift
@@ -30,12 +30,10 @@ extension WorkerLogging {
     }
 }
 
-private extension OSLog {
-    static let worker = OSLog(subsystem: "com.squareup.WorkflowRxSwift", category: "Worker")
+extension OSLog {
+    fileprivate static let worker = OSLog(subsystem: "com.squareup.WorkflowRxSwift", category: "Worker")
 
-    static var active: OSLog = {
-        WorkflowLogging.isOSLoggingAllowed ? .worker : .disabled
-    }()
+    fileprivate static var active: OSLog = WorkflowLogging.isOSLoggingAllowed ? .worker : .disabled
 }
 
 // MARK: -
diff --git a/WorkflowRxSwift/Testing/ObservableTesting.swift b/WorkflowRxSwift/Testing/ObservableTesting.swift
index ff10e0c14..273ccb16c 100644
--- a/WorkflowRxSwift/Testing/ObservableTesting.swift
+++ b/WorkflowRxSwift/Testing/ObservableTesting.swift
@@ -20,14 +20,14 @@ import WorkflowTesting
 import XCTest
 @testable import WorkflowRxSwift
 
-public extension RenderTester {
+extension RenderTester {
     /// Expect the given worker. It will be checked for `isEquivalent(to:)` with the requested worker.
 
     /// - Parameters:
     ///   - outputType: The `OutputType` of the expected `ObservableWorkflow`.
     ///   - producingOutput: An output that will be returned when this worker is requested, if any.
     ///   - key: Key to expect this `Workflow` to be rendered with.
-    func expectObservable<OutputType>(
+    public func expectObservable<OutputType>(
         outputType: OutputType.Type = OutputType.self,
         producingOutput output: OutputType? = nil,
         key: String = "",
diff --git a/WorkflowRxSwift/Testing/WorkerTesting.swift b/WorkflowRxSwift/Testing/WorkerTesting.swift
index 75b94cece..380ec77dc 100644
--- a/WorkflowRxSwift/Testing/WorkerTesting.swift
+++ b/WorkflowRxSwift/Testing/WorkerTesting.swift
@@ -20,13 +20,13 @@ import WorkflowTesting
 import XCTest
 @testable import WorkflowRxSwift
 
-public extension RenderTester {
+extension RenderTester {
     /// Expect the given worker. It will be checked for `isEquivalent(to:)` with the requested worker.
 
     /// - Parameters:
     ///   - worker: The worker to be expected
     ///   - output: An output that will be returned when this worker is requested, if any.
-    func expect<ExpectedWorkerType: Worker>(
+    public func expect<ExpectedWorkerType: Worker>(
         worker: ExpectedWorkerType,
         producingOutput output: ExpectedWorkerType.Output? = nil,
         key: String = "",
diff --git a/WorkflowRxSwift/TestingTests/TestingTests.swift b/WorkflowRxSwift/TestingTests/TestingTests.swift
index 4407f6058..fa64f3902 100644
--- a/WorkflowRxSwift/TestingTests/TestingTests.swift
+++ b/WorkflowRxSwift/TestingTests/TestingTests.swift
@@ -82,7 +82,7 @@ class WorkflowReactiveSwiftTestingTests: XCTestCase {
         file: StaticString = #file, line: UInt = #line,
         perform: () -> Result
     ) -> Result {
-        return expectingFailures([messageSubstring], file: file, line: line, perform: perform)
+        expectingFailures([messageSubstring], file: file, line: line, perform: perform)
     }
 
     @discardableResult
diff --git a/WorkflowRxSwift/Tests/ObservableTests.swift b/WorkflowRxSwift/Tests/ObservableTests.swift
index 6eae879f7..67885e001 100644
--- a/WorkflowRxSwift/Tests/ObservableTests.swift
+++ b/WorkflowRxSwift/Tests/ObservableTests.swift
@@ -74,7 +74,7 @@ class ObservableTests: XCTestCase {
         let observable = Observable.from([1, 2, 3])
             .do(onDispose: {
                 expectation.fulfill()
-        })
+            })
 
         let host = WorkflowHost(
             workflow: ObservableWorkflow(observable: observable)
diff --git a/WorkflowRxSwift/Tests/Rx+ReactiveWorkers.swift b/WorkflowRxSwift/Tests/Rx+ReactiveWorkers.swift
index 9dec41a89..43354aa20 100644
--- a/WorkflowRxSwift/Tests/Rx+ReactiveWorkers.swift
+++ b/WorkflowRxSwift/Tests/Rx+ReactiveWorkers.swift
@@ -48,7 +48,7 @@ class Rx_ReactiveWorkersTests: XCTestCase {
                 func apply(toState state: inout State) -> Output? {
                     switch self {
                     case .complete:
-                        return .finished
+                        .finished
                     }
                 }
             }
diff --git a/WorkflowRxSwift/Tests/WorkerTests.swift b/WorkflowRxSwift/Tests/WorkerTests.swift
index db59260ce..d865a51b6 100644
--- a/WorkflowRxSwift/Tests/WorkerTests.swift
+++ b/WorkflowRxSwift/Tests/WorkerTests.swift
@@ -93,9 +93,9 @@ class WorkerTests: XCTestCase {
                         .never()
                         .startWith(())
                         .do(onSubscribed: {
-                            self.startExpectation.fulfill()
+                            startExpectation.fulfill()
                         }, onDispose: {
-                            self.endExpectation.fulfill()
+                            endExpectation.fulfill()
                         })
                 }
 
diff --git a/WorkflowSwiftUI/Sources/ActionModel.swift b/WorkflowSwiftUI/Sources/ActionModel.swift
index 10c2e5f17..8b8f97bd1 100644
--- a/WorkflowSwiftUI/Sources/ActionModel.swift
+++ b/WorkflowSwiftUI/Sources/ActionModel.swift
@@ -37,10 +37,10 @@ extension ActionModel: Identifiable where State: Identifiable {
 
 #if DEBUG
 
-public extension ActionModel {
+extension ActionModel {
     /// Creates a static model which ignores all sent values, suitable for static previews
     /// or testing.
-    static func constant(state: State) -> ActionModel<State, Action> {
+    public static func constant(state: State) -> ActionModel<State, Action> {
         ActionModel(accessor: .constant(state: state), sendAction: { _ in })
     }
 }
diff --git a/WorkflowSwiftUI/Sources/Bindable+Store.swift b/WorkflowSwiftUI/Sources/Bindable+Store.swift
index c0709fbe6..f8a21f671 100644
--- a/WorkflowSwiftUI/Sources/Bindable+Store.swift
+++ b/WorkflowSwiftUI/Sources/Bindable+Store.swift
@@ -3,9 +3,9 @@ import Perception
 import SwiftUI
 import Workflow
 
-public extension Perception.Bindable {
+extension Perception.Bindable {
     @_disfavoredOverload
-    subscript<Model: ObservableModel, Member>(
+    public subscript<Model: ObservableModel, Member>(
         dynamicMember keyPath: KeyPath<Model.State, Member>
     ) -> _StoreBindable<Model, Member>
         where Value == Store<Model>
@@ -111,12 +111,12 @@ public struct _StoreBindable<Model: ObservableModel, Value> {
     }
 }
 
-public extension _StoreBindable where Model: SingleActionModel {
+extension _StoreBindable where Model: SingleActionModel {
     /// Creates a binding to the value by sending new values through the model's action.
     ///
     /// - Parameter action: An action to contain sent values.
     /// - Returns: A binding.
-    func sending(
+    public func sending(
         action: CaseKeyPath<Model.Action, Value>
     ) -> Binding<Value> {
         bindable[state: keyPath, action: action]
diff --git a/WorkflowSwiftUI/Sources/Derived/ObservationStateRegistrar.swift b/WorkflowSwiftUI/Sources/Derived/ObservationStateRegistrar.swift
index 591e4bcb7..3153f02c3 100644
--- a/WorkflowSwiftUI/Sources/Derived/ObservationStateRegistrar.swift
+++ b/WorkflowSwiftUI/Sources/Derived/ObservationStateRegistrar.swift
@@ -25,14 +25,14 @@ extension ObservationStateRegistrar: Equatable, Hashable, Codable {
 
 #if canImport(Observation)
 @available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
-public extension ObservationStateRegistrar {
+extension ObservationStateRegistrar {
     /// Registers access to a specific property for observation.
     ///
     /// - Parameters:
     ///   - subject: An instance of an observable type.
     ///   - keyPath: The key path of an observed property.
     @inlinable
-    func access<Subject: Observable>(
+    public func access<Subject: Observable>(
         _ subject: Subject,
         keyPath: KeyPath<Subject, some Any>
     ) {
@@ -50,7 +50,7 @@ public extension ObservationStateRegistrar {
     ///   - isIdentityEqual: A comparison function that determines whether two values have the same
     ///     identity or not.
     @inlinable
-    func mutate<Subject: Observable, Value>(
+    public func mutate<Subject: Observable, Value>(
         _ subject: Subject,
         keyPath: KeyPath<Subject, some Any>,
         _ value: inout Value,
@@ -71,7 +71,7 @@ public extension ObservationStateRegistrar {
     /// See ``willModify(_:keyPath:_:)-29op6`` info on what this method does when used with
     /// observable values.
     @inlinable
-    func willModify<Subject: Observable, Member>(
+    public func willModify<Subject: Observable, Member>(
         _ subject: Subject,
         keyPath: KeyPath<Subject, Member>,
         _ member: inout Member
@@ -86,7 +86,7 @@ public extension ObservationStateRegistrar {
     ///   - keyPath: The key path of an observed property.
     ///   - member: The value in the subject that will be set.
     @inlinable
-    func willModify<Subject: Observable, Member: ObservableState>(
+    public func willModify<Subject: Observable, Member: ObservableState>(
         _ subject: Subject,
         keyPath: KeyPath<Subject, Member>,
         _ member: inout Member
@@ -100,7 +100,7 @@ public extension ObservationStateRegistrar {
     /// If the identity of the value changed between ``willModify(_:keyPath:_:)-29op6`` and
     /// ``didModify(_:keyPath:_:_:_:)-34nhq``, observers are notified.
     @inlinable
-    func didModify<Subject: Observable, Member>(
+    public func didModify<Subject: Observable, Member>(
         _ subject: Subject,
         keyPath: KeyPath<Subject, Member>,
         _ member: inout Member,
@@ -117,10 +117,10 @@ public extension ObservationStateRegistrar {
 #endif
 
 #if !os(visionOS)
-public extension ObservationStateRegistrar {
+extension ObservationStateRegistrar {
     @_disfavoredOverload
     @inlinable
-    func access<Subject: Perceptible>(
+    public func access<Subject: Perceptible>(
         _ subject: Subject,
         keyPath: KeyPath<Subject, some Any>
     ) {
@@ -129,7 +129,7 @@ public extension ObservationStateRegistrar {
 
     @_disfavoredOverload
     @inlinable
-    func mutate<Subject: Perceptible, Value>(
+    public func mutate<Subject: Perceptible, Value>(
         _ subject: Subject,
         keyPath: KeyPath<Subject, some Any>,
         _ value: inout Value,
@@ -147,7 +147,7 @@ public extension ObservationStateRegistrar {
 
     @_disfavoredOverload
     @inlinable
-    func willModify<Subject: Perceptible, Member>(
+    public func willModify<Subject: Perceptible, Member>(
         _ subject: Subject,
         keyPath: KeyPath<Subject, Member>,
         _ member: inout Member
@@ -157,7 +157,7 @@ public extension ObservationStateRegistrar {
 
     @_disfavoredOverload
     @inlinable
-    func willModify<Subject: Perceptible, Member: ObservableState>(
+    public func willModify<Subject: Perceptible, Member: ObservableState>(
         _ subject: Subject,
         keyPath: KeyPath<Subject, Member>,
         _ member: inout Member
@@ -168,7 +168,7 @@ public extension ObservationStateRegistrar {
 
     @_disfavoredOverload
     @inlinable
-    func didModify<Subject: Perceptible, Member>(
+    public func didModify<Subject: Perceptible, Member>(
         _ subject: Subject,
         keyPath: KeyPath<Subject, Member>,
         _ member: inout Member,
diff --git a/WorkflowSwiftUI/Sources/ObservableModel.swift b/WorkflowSwiftUI/Sources/ObservableModel.swift
index 303e2a930..2a22b7c32 100644
--- a/WorkflowSwiftUI/Sources/ObservableModel.swift
+++ b/WorkflowSwiftUI/Sources/ObservableModel.swift
@@ -137,9 +137,9 @@ public protocol ObservableModel<State> {
     var accessor: StateAccessor<State> { get }
 }
 
-public extension ObservableModel {
+extension ObservableModel {
     /// Allows dynamic member lookup to read and write state through the accessor.
-    subscript<T>(dynamicMember keyPath: WritableKeyPath<State, T>) -> T {
+    public subscript<T>(dynamicMember keyPath: WritableKeyPath<State, T>) -> T {
         get {
             accessor.state[keyPath: keyPath]
         }
diff --git a/WorkflowSwiftUI/Sources/ObservableScreen+Preview.swift b/WorkflowSwiftUI/Sources/ObservableScreen+Preview.swift
index c84223d16..73f037302 100644
--- a/WorkflowSwiftUI/Sources/ObservableScreen+Preview.swift
+++ b/WorkflowSwiftUI/Sources/ObservableScreen+Preview.swift
@@ -6,7 +6,7 @@ import SwiftUI
 import Workflow
 import WorkflowUI
 
-public extension ObservableScreen {
+extension ObservableScreen {
     /// Generates a static preview of this screen type.
     ///
     /// Previews generated with this method are static and do not update state. To generate a
@@ -16,7 +16,7 @@ public extension ObservableScreen {
     /// - Parameter makeModel: A closure to create the screen's model. The provided `context` param
     ///   is a convenience to generate dummy sinks and state accessors.
     /// - Returns: A View for previews.
-    static func observableScreenPreview(makeModel: (StaticStorePreviewContext) -> Model) -> some View {
+    public static func observableScreenPreview(makeModel: (StaticStorePreviewContext) -> Model) -> some View {
         let store = Store<Model>.preview(makeModel: makeModel)
         return Self.makeView(store: store)
     }
@@ -29,7 +29,7 @@ public extension ObservableScreen {
     ///
     /// - Parameter state: The state of the screen.
     /// - Returns: A View for previews.
-    static func observableScreenPreview<S, A>(state: S) -> some View where Model == ActionModel<S, A> {
+    public static func observableScreenPreview<S, A>(state: S) -> some View where Model == ActionModel<S, A> {
         observableScreenPreview { context in
             context.makeActionModel(state: state)
         }
@@ -43,7 +43,7 @@ public extension ObservableScreen {
     ///
     /// - Parameter state: The state of the screen.
     /// - Returns: A View for previews.
-    static func observableScreenPreview<S>(state: S) -> some View where Model == StateAccessor<S> {
+    public static func observableScreenPreview<S>(state: S) -> some View where Model == StateAccessor<S> {
         observableScreenPreview { context in
             context.makeStateAccessor(state: state)
         }
diff --git a/WorkflowSwiftUI/Sources/ObservableScreen.swift b/WorkflowSwiftUI/Sources/ObservableScreen.swift
index d5365b964..a888a6d5f 100644
--- a/WorkflowSwiftUI/Sources/ObservableScreen.swift
+++ b/WorkflowSwiftUI/Sources/ObservableScreen.swift
@@ -36,12 +36,12 @@ public protocol ObservableScreen: Screen {
     static func makeView(store: Store<Model>) -> Content
 }
 
-public extension ObservableScreen {
-    var sizingOptions: SwiftUIScreenSizingOptions { [] }
+extension ObservableScreen {
+    public var sizingOptions: SwiftUIScreenSizingOptions { [] }
 }
 
-public extension ObservableScreen {
-    func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
+extension ObservableScreen {
+    public func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
         ViewControllerDescription(
             type: ModeledHostingController<Model, Content>.self,
             environment: environment,
@@ -203,9 +203,9 @@ private final class ModeledHostingController<Model, Content: View>: UIHostingCon
     }
 }
 
-fileprivate extension SwiftUIScreenSizingOptions {
+extension SwiftUIScreenSizingOptions {
     @available(iOS 16.0, *)
-    var uiHostingControllerSizingOptions: UIHostingControllerSizingOptions {
+    fileprivate var uiHostingControllerSizingOptions: UIHostingControllerSizingOptions {
         var options = UIHostingControllerSizingOptions()
 
         if contains(.preferredContentSize) {
diff --git a/WorkflowSwiftUI/Sources/RenderContext+ObservableModel.swift b/WorkflowSwiftUI/Sources/RenderContext+ObservableModel.swift
index ae28af3c7..3eda48859 100644
--- a/WorkflowSwiftUI/Sources/RenderContext+ObservableModel.swift
+++ b/WorkflowSwiftUI/Sources/RenderContext+ObservableModel.swift
@@ -1,13 +1,13 @@
 import Foundation
 import Workflow
 
-public extension RenderContext where WorkflowType.State: ObservableState {
+extension RenderContext where WorkflowType.State: ObservableState {
     /// Creates a ``StateAccessor`` for this workflow's state.
     ///
     /// ``StateAccessor`` is used by ``ObservableModel`` to read and write observable state. A state
     /// accessor can serve as the ``ObservableModel`` implementation for simple workflows with no
     /// actions. State updates will be sent to the workflow's state mutation sink.
-    func makeStateAccessor(
+    public func makeStateAccessor(
         state: WorkflowType.State
     ) -> StateAccessor<WorkflowType.State> {
         StateAccessor(state: state, sendValue: makeStateMutationSink().send)
@@ -19,7 +19,7 @@ public extension RenderContext where WorkflowType.State: ObservableState {
     /// type. For more complex workflows with multiple actions, you can create a custom model that
     /// conforms to ``ObservableModel``. For less complex workflows, you can use
     /// ``makeStateAccessor(state:)`` instead. See ``ObservableModel`` for more information.
-    func makeActionModel<Action: WorkflowAction>(
+    public func makeActionModel<Action: WorkflowAction>(
         state: WorkflowType.State
     ) -> ActionModel<WorkflowType.State, Action>
         where Action.WorkflowType == WorkflowType
diff --git a/WorkflowSwiftUI/Sources/StateAccessor.swift b/WorkflowSwiftUI/Sources/StateAccessor.swift
index c71351c27..d6c4a356a 100644
--- a/WorkflowSwiftUI/Sources/StateAccessor.swift
+++ b/WorkflowSwiftUI/Sources/StateAccessor.swift
@@ -40,10 +40,10 @@ extension StateAccessor: Identifiable where State: Identifiable {
 
 #if DEBUG
 
-public extension StateAccessor {
+extension StateAccessor {
     /// Creates a static state accessor which ignores all sent values, suitable for static previews
     /// or testing.
-    static func constant(state: State) -> StateAccessor<State> {
+    public static func constant(state: State) -> StateAccessor<State> {
         StateAccessor(state: state, sendValue: { _ in })
     }
 }
diff --git a/WorkflowSwiftUI/Sources/Store+Preview.swift b/WorkflowSwiftUI/Sources/Store+Preview.swift
index 9221174b5..ef7216473 100644
--- a/WorkflowSwiftUI/Sources/Store+Preview.swift
+++ b/WorkflowSwiftUI/Sources/Store+Preview.swift
@@ -22,7 +22,7 @@ public struct StaticStorePreviewContext {
     }
 }
 
-public extension Store {
+extension Store {
     /// Generates a static store for previews.
     ///
     /// Previews generated with this method are static and do not update state. To generate a
@@ -32,7 +32,7 @@ public extension Store {
     /// - Parameter makeModel: A closure to create the store's model. The provided `context` param
     ///  is a convenience to generate dummy sinks and state accessors.
     /// - Returns: A store for previews.
-    static func preview(
+    public static func preview(
         makeModel: (StaticStorePreviewContext) -> Model
     ) -> Store {
         let context = StaticStorePreviewContext()
@@ -49,7 +49,7 @@ public extension Store {
     ///
     /// - Parameter state: The state of the view.
     /// - Returns: A store for previews.
-    static func preview<State, Action>(
+    public static func preview<State, Action>(
         state: State
     ) -> Store<ActionModel<State, Action>> where Model == ActionModel<State, Action> {
         preview { context in
@@ -65,7 +65,7 @@ public extension Store {
     ///
     /// - Parameter state: The state of the view.
     /// - Returns: A store for previews.
-    static func preview<State>(
+    public static func preview<State>(
         state: State
     ) -> Store<StateAccessor<State>> where Model == StateAccessor<State> {
         preview { context in
diff --git a/WorkflowSwiftUI/Sources/Store.swift b/WorkflowSwiftUI/Sources/Store.swift
index 3258dc48a..7f1ae18f5 100644
--- a/WorkflowSwiftUI/Sources/Store.swift
+++ b/WorkflowSwiftUI/Sources/Store.swift
@@ -112,12 +112,12 @@ public final class Store<Model: ObservableModel>: Perceptible {
 
 // MARK: - Subscripting
 
-public extension Store {
-    subscript<T>(dynamicMember keyPath: KeyPath<State, T>) -> T {
+extension Store {
+    public subscript<T>(dynamicMember keyPath: KeyPath<State, T>) -> T {
         state[keyPath: keyPath]
     }
 
-    subscript<T>(dynamicMember keyPath: WritableKeyPath<State, T>) -> T {
+    public subscript<T>(dynamicMember keyPath: WritableKeyPath<State, T>) -> T {
         get {
             state[keyPath: keyPath]
         }
@@ -126,11 +126,11 @@ public extension Store {
         }
     }
 
-    subscript<Action>(dynamicMember keyPath: KeyPath<Model, Sink<Action>>) -> Sink<Action> {
+    public subscript<Action>(dynamicMember keyPath: KeyPath<Model, Sink<Action>>) -> Sink<Action> {
         model[keyPath: keyPath]
     }
 
-    subscript<Value>(
+    public subscript<Value>(
         state state: KeyPath<State, Value>,
         send send: KeyPath<Model, (Value) -> Void>
     ) -> Value {
@@ -142,7 +142,7 @@ public extension Store {
         }
     }
 
-    subscript<Value, Action>(
+    public subscript<Value, Action>(
         state state: KeyPath<State, Value>,
         sink sink: KeyPath<Model, Sink<Action>>,
         action action: CaseKeyPath<Action, Value>
@@ -158,9 +158,9 @@ public extension Store {
 
 // MARK: - Scoping
 
-public extension Store {
+extension Store {
     /// Holds a cached child store for a nested ObservableModel on this store's model.
-    internal struct ChildStore {
+    struct ChildStore {
         var store: Any
         var setModel: (Model) -> Void
         var isInvalid: (Model) -> Bool
@@ -191,7 +191,7 @@ public extension Store {
     ///
     /// Each nested model's scope will track its own mutations, but we use this to track mutations
     /// to the wrapper itself, such as changes to a collection size.
-    internal struct ChildModelAccess {
+    struct ChildModelAccess {
         var willSet: (Store<Model>) -> Void
         var didSet: (Store<Model>) -> Void
         var isChanged: (Model, Model) -> Bool
@@ -214,7 +214,7 @@ public extension Store {
     }
 
     /// Track access to a child store wrapper.
-    internal func access(
+    func access(
         keyPath key: KeyPath<Model, some Any>,
         isChanged: @escaping (Model, Model) -> Bool,
         isInvalid: @escaping (Model) -> Bool = { _ in false }
@@ -229,7 +229,7 @@ public extension Store {
         }
     }
 
-    internal func scope<ChildModel>(
+    func scope<ChildModel>(
         key: AnyHashable,
         getModel: @escaping (Model) -> ChildModel,
         isInvalid: @escaping (Model) -> Bool
@@ -254,7 +254,7 @@ public extension Store {
 
     // Normal props
 
-    func scope<ChildModel>(keyPath: KeyPath<Model, ChildModel>) -> Store<ChildModel> {
+    public func scope<ChildModel>(keyPath: KeyPath<Model, ChildModel>) -> Store<ChildModel> {
         scope(
             key: keyPath,
             getModel: { $0[keyPath: keyPath] },
@@ -264,7 +264,7 @@ public extension Store {
 
     // Optionals
 
-    func scope<ChildModel>(
+    public func scope<ChildModel>(
         keyPath: KeyPath<Model, ChildModel?>
     ) -> Store<ChildModel>? {
         access(keyPath: keyPath) { oldModel, newModel in
@@ -289,7 +289,7 @@ public extension Store {
 
     // Collections
 
-    func scope<ChildModel, ChildCollection>(
+    public func scope<ChildModel, ChildCollection>(
         collection: KeyPath<Model, ChildCollection>
     ) -> _StoreCollection<ChildModel>
         where
@@ -321,7 +321,7 @@ public extension Store {
         }
     }
 
-    func scope<ChildModel>(
+    public func scope<ChildModel>(
         collection: KeyPath<Model, IdentifiedArray<some Any, ChildModel>>
     ) -> _StoreCollection<ChildModel> where ChildModel: ObservableModel {
         access(keyPath: collection) { oldModel, newModel in
@@ -359,17 +359,17 @@ public extension Store {
         }
     }
 
-    subscript<ChildModel: ObservableModel>(dynamicMember keyPath: KeyPath<Model, ChildModel>) -> Store<ChildModel> {
+    public subscript<ChildModel: ObservableModel>(dynamicMember keyPath: KeyPath<Model, ChildModel>) -> Store<ChildModel> {
         scope(keyPath: keyPath)
     }
 
-    subscript<ChildModel>(
+    public subscript<ChildModel>(
         dynamicMember keyPath: KeyPath<Model, ChildModel?>
     ) -> Store<ChildModel>? {
         scope(keyPath: keyPath)
     }
 
-    subscript<ChildModel, ChildCollection>(
+    public subscript<ChildModel, ChildCollection>(
         dynamicMember collection: KeyPath<Model, ChildCollection>
     ) -> _StoreCollection<ChildModel> where
         ChildModel: ObservableModel,
@@ -380,7 +380,7 @@ public extension Store {
         scope(collection: collection)
     }
 
-    subscript<ChildModel>(
+    public subscript<ChildModel>(
         dynamicMember collection: KeyPath<Model, IdentifiedArray<some Any, ChildModel>>
     ) -> _StoreCollection<ChildModel> where ChildModel: ObservableModel {
         scope(collection: collection)
@@ -408,19 +408,19 @@ public struct _StoreCollection<Model: ObservableModel>: RandomAccessCollection {
 
 // MARK: - Single action conveniences
 
-public extension Store where Model: SingleActionModel {
-    func action(_ action: Model.Action) -> () -> Void {
+extension Store where Model: SingleActionModel {
+    public func action(_ action: Model.Action) -> () -> Void {
         { self.send(action) }
     }
 
-    func send(_ action: Model.Action) {
+    public func send(_ action: Model.Action) {
         guard !invalidated else {
             return
         }
         model.sendAction(action)
     }
 
-    subscript<Value>(
+    public subscript<Value>(
         state keyPath: KeyPath<State, Value>,
         action action: CaseKeyPath<Model.Action, Value>
     ) -> Value {
diff --git a/WorkflowSwiftUI/Sources/Workflow+Preview.swift b/WorkflowSwiftUI/Sources/Workflow+Preview.swift
index f26d7a05a..67631d6a5 100644
--- a/WorkflowSwiftUI/Sources/Workflow+Preview.swift
+++ b/WorkflowSwiftUI/Sources/Workflow+Preview.swift
@@ -7,8 +7,8 @@ import SwiftUI
 import Workflow
 import WorkflowUI
 
-public extension Workflow where Rendering: Screen {
-    func workflowPreview(
+extension Workflow where Rendering: Screen {
+    public func workflowPreview(
         customizeEnvironment: @escaping (inout ViewEnvironment) -> Void = { _ in },
         onOutput: @escaping (Output) -> Void
     ) -> some View {
@@ -21,8 +21,8 @@ public extension Workflow where Rendering: Screen {
     }
 }
 
-public extension Workflow where Rendering: Screen, Output == Never {
-    func workflowPreview(
+extension Workflow where Rendering: Screen, Output == Never {
+    public func workflowPreview(
         customizeEnvironment: @escaping (inout ViewEnvironment) -> Void = { _ in }
     ) -> some View {
         PreviewView(
diff --git a/WorkflowSwiftUI/Sources/WorkflowView.swift b/WorkflowSwiftUI/Sources/WorkflowView.swift
index d88e9995f..897844b33 100644
--- a/WorkflowSwiftUI/Sources/WorkflowView.swift
+++ b/WorkflowSwiftUI/Sources/WorkflowView.swift
@@ -71,25 +71,25 @@ public struct WorkflowView<T: Workflow, Content: View>: View {
 }
 
 @available(*, deprecated, message: "Use ObservableScreen to render SwiftUI content")
-public extension WorkflowView where T.Output == Never {
+extension WorkflowView where T.Output == Never {
     /// Convenience initializer for workflows with no output.
-    init(workflow: T, content: @escaping (T.Rendering) -> Content) {
+    public init(workflow: T, content: @escaping (T.Rendering) -> Content) {
         self.init(workflow: workflow, onOutput: { _ in }, content: content)
     }
 }
 
 @available(*, deprecated, message: "Use ObservableScreen to render SwiftUI content")
-public extension WorkflowView where T.Rendering == Content {
+extension WorkflowView where T.Rendering == Content {
     /// Convenience initializer for workflows whose rendering type conforms to `View`.
-    init(workflow: T, onOutput: @escaping (T.Output) -> Void) {
+    public init(workflow: T, onOutput: @escaping (T.Output) -> Void) {
         self.init(workflow: workflow, onOutput: onOutput, content: { $0 })
     }
 }
 
 @available(*, deprecated, message: "Use ObservableScreen to render SwiftUI content")
-public extension WorkflowView where T.Output == Never, T.Rendering == Content {
+extension WorkflowView where T.Output == Never, T.Rendering == Content {
     /// Convenience initializer for workflows with no output whose rendering type conforms to `View`.
-    init(workflow: T) {
+    public init(workflow: T) {
         self.init(workflow: workflow, onOutput: { _ in }, content: { $0 })
     }
 }
diff --git a/WorkflowSwiftUI/Tests/Derived/ObservableStateTests.swift b/WorkflowSwiftUI/Tests/Derived/ObservableStateTests.swift
index 38e51b006..f3789dde1 100644
--- a/WorkflowSwiftUI/Tests/Derived/ObservableStateTests.swift
+++ b/WorkflowSwiftUI/Tests/Derived/ObservableStateTests.swift
@@ -125,13 +125,13 @@ final class ObservableStateTests: XCTestCase {
         do {
             var state = ParentState(optional: nil)
             let optionalDidChange = expectation(description: "optional.didChange")
-            
+
             withPerceptionTracking {
                 _ = state.optional
             } onChange: {
                 optionalDidChange.fulfill()
             }
-            
+
             state.optional = ChildState(count: 42)
             await fulfillment(of: [optionalDidChange], timeout: 0)
             XCTAssertEqual(state.optional?.count, 42)
@@ -141,13 +141,13 @@ final class ObservableStateTests: XCTestCase {
         do {
             var state = ParentState(optional: nil)
             let optionalDidChange = expectation(description: "optional.didChange")
-            
+
             withPerceptionTracking {
                 _ = state.optional
             } onChange: {
                 optionalDidChange.fulfill()
             }
-            
+
             state.optional = nil
             await fulfillment(of: [optionalDidChange], timeout: 0)
             XCTAssertNil(state.optional)
@@ -157,13 +157,13 @@ final class ObservableStateTests: XCTestCase {
         do {
             var state = ParentState(optional: ChildState())
             let optionalDidChange = expectation(description: "optional.didChange")
-            
+
             withPerceptionTracking {
                 _ = state.optional
             } onChange: {
                 optionalDidChange.fulfill()
             }
-            
+
             state.optional = nil
             await fulfillment(of: [optionalDidChange], timeout: 0)
             XCTAssertNil(state.optional)
diff --git a/WorkflowSwiftUIExperimental/Sources/ObservableValue+Binding.swift b/WorkflowSwiftUIExperimental/Sources/ObservableValue+Binding.swift
index 18b791767..d1d035b56 100644
--- a/WorkflowSwiftUIExperimental/Sources/ObservableValue+Binding.swift
+++ b/WorkflowSwiftUIExperimental/Sources/ObservableValue+Binding.swift
@@ -18,8 +18,8 @@
 
 import SwiftUI
 
-public extension ObservableValue {
-    func binding<T>(
+extension ObservableValue {
+    public func binding<T>(
         get: @escaping (Value) -> T,
         set: @escaping (Value) -> (T) -> Void
     ) -> Binding<T> {
diff --git a/WorkflowSwiftUIExperimental/Sources/ObservableValue.swift b/WorkflowSwiftUIExperimental/Sources/ObservableValue.swift
index ecdca00b7..02274d9d8 100644
--- a/WorkflowSwiftUIExperimental/Sources/ObservableValue.swift
+++ b/WorkflowSwiftUIExperimental/Sources/ObservableValue.swift
@@ -26,7 +26,7 @@ public final class ObservableValue<Value>: ObservableObject {
 
     public private(set) var value: Value {
         get {
-            return internalValue
+            internalValue
         }
         set {
             subject.send(newValue)
@@ -54,7 +54,7 @@ public final class ObservableValue<Value>: ObservableObject {
         self.cancellable = valuePublisher()
             .dropFirst()
             .sink { [weak self] newValue in
-                guard let self = self else { return }
+                guard let self else { return }
                 self.objectWillChange.send()
                 self.internalValue = newValue
             }
@@ -68,14 +68,14 @@ public final class ObservableValue<Value>: ObservableObject {
     ///   - isEquivalent: An optional closure that checks to see if a LocalValue is equivalent.
     /// - Returns: a scoped ObservableValue of LocalValue.
     public func scope<LocalValue>(_ toLocalValue: @escaping (Value) -> LocalValue, isEquivalent: ((LocalValue, LocalValue) -> Bool)? = nil) -> ObservableValue<LocalValue> {
-        return scopeToLocalValue(toLocalValue, isEquivalent: isEquivalent)
+        scopeToLocalValue(toLocalValue, isEquivalent: isEquivalent)
     }
 
     /// Scopes the ObservableValue to a subset of Value to LocalValue given the supplied closure and removes duplicate values using Equatable.
     /// - Parameter toLocalValue: A closure that takes a Value and returns a LocalValue.
     /// - Returns: a scoped ObservableValue of LocalValue.
     public func scope<LocalValue>(_ toLocalValue: @escaping (Value) -> LocalValue) -> ObservableValue<LocalValue> where LocalValue: Equatable {
-        return scopeToLocalValue(toLocalValue, isEquivalent: { $0 == $1 })
+        scopeToLocalValue(toLocalValue, isEquivalent: { $0 == $1 })
     }
 
     /// Returns the value at the given keypath of ``Value``.
@@ -98,7 +98,7 @@ public final class ObservableValue<Value>: ObservableObject {
     }
 
     private func valuePublisher() -> AnyPublisher<Value, Never> {
-        guard let isEquivalent = isEquivalent else {
+        guard let isEquivalent else {
             return subject.eraseToAnyPublisher()
         }
 
diff --git a/WorkflowSwiftUIExperimental/Sources/SwiftUIScreen.swift b/WorkflowSwiftUIExperimental/Sources/SwiftUIScreen.swift
index 2b915b1e7..b00d33ddb 100644
--- a/WorkflowSwiftUIExperimental/Sources/SwiftUIScreen.swift
+++ b/WorkflowSwiftUIExperimental/Sources/SwiftUIScreen.swift
@@ -31,20 +31,20 @@ public protocol SwiftUIScreen: Screen {
     static var isEquivalent: ((Self, Self) -> Bool)? { get }
 }
 
-public extension SwiftUIScreen {
-    var sizingOptions: SwiftUIScreenSizingOptions { [] }
+extension SwiftUIScreen {
+    public var sizingOptions: SwiftUIScreenSizingOptions { [] }
 }
 
-public extension SwiftUIScreen {
-    static var isEquivalent: ((Self, Self) -> Bool)? { nil }
+extension SwiftUIScreen {
+    public static var isEquivalent: ((Self, Self) -> Bool)? { nil }
 }
 
-public extension SwiftUIScreen where Self: Equatable {
-    static var isEquivalent: ((Self, Self) -> Bool)? { { $0 == $1 } }
+extension SwiftUIScreen where Self: Equatable {
+    public static var isEquivalent: ((Self, Self) -> Bool)? { { $0 == $1 } }
 }
 
-public extension SwiftUIScreen {
-    func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
+extension SwiftUIScreen {
+    public func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
         ViewControllerDescription(
             type: ModeledHostingController<Self, WithModel<Self, EnvironmentInjectingView<Content>>>.self,
             environment: environment,
@@ -201,9 +201,9 @@ private final class ModeledHostingController<Model, Content: View>: UIHostingCon
     }
 }
 
-fileprivate extension SwiftUIScreenSizingOptions {
+extension SwiftUIScreenSizingOptions {
     @available(iOS 16.0, *)
-    var uiHostingControllerSizingOptions: UIHostingControllerSizingOptions {
+    fileprivate var uiHostingControllerSizingOptions: UIHostingControllerSizingOptions {
         var options = UIHostingControllerSizingOptions()
 
         if contains(.preferredContentSize) {
diff --git a/WorkflowSwiftUIMacros/Sources/Derived/Availability.swift b/WorkflowSwiftUIMacros/Sources/Derived/Availability.swift
index fa005b4f3..456dbfa55 100644
--- a/WorkflowSwiftUIMacros/Sources/Derived/Availability.swift
+++ b/WorkflowSwiftUIMacros/Sources/Derived/Availability.swift
@@ -21,9 +21,9 @@ import SwiftSyntaxMacros
 extension AttributeSyntax {
     var availability: AttributeSyntax? {
         if attributeName.identifier == "available" {
-            return self
+            self
         } else {
-            return nil
+            nil
         }
     }
 }
@@ -33,12 +33,12 @@ extension IfConfigClauseSyntax.Elements {
         switch self {
         case .attributes(let attributes):
             if let availability = attributes.availability {
-                return .attributes(availability)
+                .attributes(availability)
             } else {
-                return nil
+                nil
             }
         default:
-            return nil
+            nil
         }
     }
 }
@@ -46,9 +46,9 @@ extension IfConfigClauseSyntax.Elements {
 extension IfConfigClauseSyntax {
     var availability: IfConfigClauseSyntax? {
         if let availability = elements?.availability {
-            return with(\.elements, availability)
+            with(\.elements, availability)
         } else {
-            return nil
+            nil
         }
     }
 
diff --git a/WorkflowSwiftUIMacros/Sources/Derived/Extensions.swift b/WorkflowSwiftUIMacros/Sources/Derived/Extensions.swift
index 655afc454..0595241e0 100644
--- a/WorkflowSwiftUIMacros/Sources/Derived/Extensions.swift
+++ b/WorkflowSwiftUIMacros/Sources/Derived/Extensions.swift
@@ -49,9 +49,9 @@ extension VariableDeclSyntax {
         let accessors: [AccessorDeclListSyntax.Element] = patternBindings.compactMap { patternBinding in
             switch patternBinding.accessorBlock?.accessors {
             case .accessors(let accessors):
-                return accessors
+                accessors
             default:
-                return nil
+                nil
             }
         }.flatMap { $0 }
         return accessors.compactMap { accessor in
@@ -76,13 +76,13 @@ extension VariableDeclSyntax {
 
     var isComputed: Bool {
         if accessorsMatching({ $0 == .keyword(.get) }).count > 0 {
-            return true
+            true
         } else {
-            return bindings.contains { binding in
+            bindings.contains { binding in
                 if case .getter = binding.accessorBlock?.accessors {
-                    return true
+                    true
                 } else {
-                    return false
+                    false
                 }
             }
         }
@@ -107,7 +107,7 @@ extension VariableDeclSyntax {
         for attribute in attributes {
             switch attribute {
             case .attribute(let attr):
-                if attr.attributeName.tokens(viewMode: .all).map({ $0.tokenKind }) == [.identifier(name)] {
+                if attr.attributeName.tokens(viewMode: .all).map(\.tokenKind) == [.identifier(name)] {
                     return true
                 }
             default:
@@ -121,7 +121,7 @@ extension VariableDeclSyntax {
         for attribute in attributes {
             switch attribute {
             case .attribute(let attr):
-                if attr.attributeName.tokens(viewMode: .all).map({ $0.tokenKind }) == [.identifier(name)] {
+                if attr.attributeName.tokens(viewMode: .all).map(\.tokenKind) == [.identifier(name)] {
                     return attr
                 }
             default:
diff --git a/WorkflowSwiftUIMacros/Sources/Derived/ObservableStateMacro.swift b/WorkflowSwiftUIMacros/Sources/Derived/ObservableStateMacro.swift
index 52895711f..e8b58b5a3 100644
--- a/WorkflowSwiftUIMacros/Sources/Derived/ObservableStateMacro.swift
+++ b/WorkflowSwiftUIMacros/Sources/Derived/ObservableStateMacro.swift
@@ -19,7 +19,7 @@ import SwiftSyntaxBuilder
 import SwiftSyntaxMacroExpansion
 import SwiftSyntaxMacros
 
-public struct ObservableStateMacro {
+public enum ObservableStateMacro {
     static let moduleName = "WorkflowSwiftUI"
 
     static let conformanceName = "ObservableState"
@@ -112,8 +112,8 @@ struct ObservationDiagnostic: DiagnosticMessage {
 }
 
 extension DiagnosticsError {
-    init<S: SyntaxProtocol>(
-        syntax: S, message: String, domain: String = "Observation", id: ObservationDiagnostic.ID,
+    init(
+        syntax: some SyntaxProtocol, message: String, domain: String = "Observation", id: ObservationDiagnostic.ID,
         severity: SwiftDiagnostics.DiagnosticSeverity = .error
     ) {
         self.init(diagnostics: [
@@ -127,19 +127,19 @@ extension DiagnosticsError {
 
 extension DeclModifierListSyntax {
     func privatePrefixed(_ prefix: String) -> DeclModifierListSyntax {
-        let modifier: DeclModifierSyntax = DeclModifierSyntax(name: "private", trailingTrivia: .space)
+        let modifier = DeclModifierSyntax(name: "private", trailingTrivia: .space)
         return [modifier]
             + filter {
                 switch $0.name.tokenKind {
                 case .keyword(let keyword):
                     switch keyword {
                     case .fileprivate, .private, .internal, .public, .package:
-                        return false
+                        false
                     default:
-                        return true
+                        true
                     }
                 default:
-                    return true
+                    true
                 }
             }
     }
@@ -153,12 +153,12 @@ extension TokenSyntax {
     func privatePrefixed(_ prefix: String) -> TokenSyntax {
         switch tokenKind {
         case .identifier(let identifier):
-            return TokenSyntax(
+            TokenSyntax(
                 .identifier(prefix + identifier), leadingTrivia: leadingTrivia,
                 trailingTrivia: trailingTrivia, presence: presence
             )
         default:
-            return self
+            self
         }
     }
 }
@@ -191,7 +191,8 @@ extension PatternBindingListSyntax {
 
 extension VariableDeclSyntax {
     func privatePrefixed(_ prefix: String, addingAttribute attribute: AttributeSyntax)
-        -> VariableDeclSyntax {
+        -> VariableDeclSyntax
+    {
         let newAttributes = attributes + [.attribute(attribute)]
         return VariableDeclSyntax(
             leadingTrivia: leadingTrivia,
@@ -212,13 +213,10 @@ extension VariableDeclSyntax {
 }
 
 extension ObservableStateMacro: MemberMacro {
-    public static func expansion<
-        Declaration: DeclGroupSyntax,
-        Context: MacroExpansionContext
-    >(
+    public static func expansion(
         of node: AttributeSyntax,
-        providingMembersOf declaration: Declaration,
-        in context: Context
+        providingMembersOf declaration: some DeclGroupSyntax,
+        in context: some MacroExpansionContext
     ) throws -> [DeclSyntax] {
         guard !declaration.isEnum
         else {
@@ -260,7 +258,7 @@ extension ObservableStateMacro: MemberMacro {
     }
 }
 
-extension Array where Element == ObservableStateCase {
+extension [ObservableStateCase] {
     init(members: MemberBlockItemListSyntax) {
         var tag = 0
         self.init(members: members, tag: &tag)
@@ -307,26 +305,25 @@ enum ObservableStateCase {
         switch self {
         case .element(let element, let tag):
             if let parameters = element.parameterClause?.parameters, parameters.count == 1 {
-                return """
+                """
                 case let .\(element.name.text)(state):
                 return ._$id(for: state)._$tag(\(tag))
                 """
             } else {
-                return """
+                """
                 case .\(element.name.text):
                 return ObservableStateID()._$tag(\(tag))
                 """
             }
         case .ifConfig(let configs):
-            return
-                configs
-                    .map {
-                        """
-                        \($0.poundKeyword.text) \($0.condition?.trimmedDescription ?? "")
-                        \($0.cases.map(\.getCase).joined(separator: "\n"))
-                        """
-                    }
-                    .joined(separator: "\n") + "#endif\n"
+            configs
+                .map {
+                    """
+                    \($0.poundKeyword.text) \($0.condition?.trimmedDescription ?? "")
+                    \($0.cases.map(\.getCase).joined(separator: "\n"))
+                    """
+                }
+                .joined(separator: "\n") + "#endif\n"
         }
     }
 
@@ -334,41 +331,38 @@ enum ObservableStateCase {
         switch self {
         case .element(let element, _):
             if let parameters = element.parameterClause?.parameters,
-                parameters.count == 1,
-                let parameter = parameters.first {
-                return """
+               parameters.count == 1,
+               let parameter = parameters.first
+            {
+                """
                 case var .\(element.name.text)(state):
                 \(ObservableStateMacro.moduleName)._$willModify(&state)
                 self = .\(element.name.text)(\(parameter.firstName.map { "\($0): " } ?? "")state)
                 """
             } else {
-                return """
+                """
                 case .\(element.name.text):
                 break
                 """
             }
         case .ifConfig(let configs):
-            return
-                configs
-                    .map {
-                        """
-                        \($0.poundKeyword.text) \($0.condition?.trimmedDescription ?? "")
-                        \($0.cases.map(\.willModifyCase).joined(separator: "\n"))
-                        """
-                    }
-                    .joined(separator: "\n") + "#endif\n"
+            configs
+                .map {
+                    """
+                    \($0.poundKeyword.text) \($0.condition?.trimmedDescription ?? "")
+                    \($0.cases.map(\.willModifyCase).joined(separator: "\n"))
+                    """
+                }
+                .joined(separator: "\n") + "#endif\n"
         }
     }
 }
 
 extension ObservableStateMacro {
-    public static func enumExpansion<
-        Declaration: DeclGroupSyntax,
-        Context: MacroExpansionContext
-    >(
+    public static func enumExpansion(
         of node: AttributeSyntax,
-        providingMembersOf declaration: Declaration,
-        in context: Context
+        providingMembersOf declaration: some DeclGroupSyntax,
+        in context: some MacroExpansionContext
     ) throws -> [DeclSyntax] {
         let cases = [ObservableStateCase](members: declaration.memberBlock.members)
         var getCases: [String] = []
@@ -399,7 +393,7 @@ extension ObservableStateMacro {
 
 extension SyntaxStringInterpolation {
     // It would be nice for SwiftSyntaxBuilder to provide this out-of-the-box.
-    mutating func appendInterpolation<Node: SyntaxProtocol>(_ node: Node?) {
+    mutating func appendInterpolation(_ node: (some SyntaxProtocol)?) {
         if let node {
             appendInterpolation(node)
         }
@@ -407,25 +401,22 @@ extension SyntaxStringInterpolation {
 }
 
 extension ObservableStateMacro: MemberAttributeMacro {
-    public static func expansion<
-        Declaration: DeclGroupSyntax,
-        MemberDeclaration: DeclSyntaxProtocol,
-        Context: MacroExpansionContext
-    >(
+    public static func expansion(
         of node: AttributeSyntax,
-        attachedTo declaration: Declaration,
-        providingAttributesFor member: MemberDeclaration,
-        in context: Context
+        attachedTo declaration: some DeclGroupSyntax,
+        providingAttributesFor member: some DeclSyntaxProtocol,
+        in context: some MacroExpansionContext
     ) throws -> [AttributeSyntax] {
         guard let property = member.as(VariableDeclSyntax.self), property.isValidForObservation,
-            property.identifier != nil
+              property.identifier != nil
         else {
             return []
         }
 
         // dont apply to ignored properties or properties that are already flagged as tracked
         if property.hasMacroApplication(ObservableStateMacro.ignoredMacroName)
-            || property.hasMacroApplication(ObservableStateMacro.trackedMacroName) {
+            || property.hasMacroApplication(ObservableStateMacro.trackedMacroName)
+        {
             return []
         }
 
@@ -449,13 +440,14 @@ extension ObservableStateMacro: MemberAttributeMacro {
 }
 
 extension VariableDeclSyntax {
-    func diagnose<C: MacroExpansionContext>(
+    func diagnose(
         attribute name: String,
         renamed rename: String,
-        context: C
+        context: some MacroExpansionContext
     ) {
         if let attribute = firstAttribute(for: name),
-            let type = attribute.attributeName.as(IdentifierTypeSyntax.self) {
+           let type = attribute.attributeName.as(IdentifierTypeSyntax.self)
+        {
             context.diagnose(
                 Diagnostic(
                     node: attribute,
@@ -504,17 +496,14 @@ extension ObservableStateMacro: ExtensionMacro {
 }
 
 public struct ObservationStateTrackedMacro: AccessorMacro {
-    public static func expansion<
-        Context: MacroExpansionContext,
-        Declaration: DeclSyntaxProtocol
-    >(
+    public static func expansion(
         of node: AttributeSyntax,
-        providingAccessorsOf declaration: Declaration,
-        in context: Context
+        providingAccessorsOf declaration: some DeclSyntaxProtocol,
+        in context: some MacroExpansionContext
     ) throws -> [AccessorDeclSyntax] {
         guard let property = declaration.as(VariableDeclSyntax.self),
-            property.isValidForObservation,
-            let identifier = property.identifier?.trimmed
+              property.isValidForObservation,
+              let identifier = property.identifier?.trimmed
         else {
             return []
         }
@@ -560,22 +549,20 @@ public struct ObservationStateTrackedMacro: AccessorMacro {
 }
 
 extension ObservationStateTrackedMacro: PeerMacro {
-    public static func expansion<
-        Context: MacroExpansionContext,
-        Declaration: DeclSyntaxProtocol
-    >(
+    public static func expansion(
         of node: SwiftSyntax.AttributeSyntax,
-        providingPeersOf declaration: Declaration,
-        in context: Context
+        providingPeersOf declaration: some DeclSyntaxProtocol,
+        in context: some MacroExpansionContext
     ) throws -> [DeclSyntax] {
         guard let property = declaration.as(VariableDeclSyntax.self),
-            property.isValidForObservation
+              property.isValidForObservation
         else {
             return []
         }
 
         if property.hasMacroApplication(ObservableStateMacro.ignoredMacroName)
-            || property.hasMacroApplication(ObservableStateMacro.trackedMacroName) {
+            || property.hasMacroApplication(ObservableStateMacro.trackedMacroName)
+        {
             return []
         }
 
@@ -586,13 +573,10 @@ extension ObservationStateTrackedMacro: PeerMacro {
 }
 
 public struct ObservationStateIgnoredMacro: AccessorMacro {
-    public static func expansion<
-        Context: MacroExpansionContext,
-        Declaration: DeclSyntaxProtocol
-    >(
+    public static func expansion(
         of node: AttributeSyntax,
-        providingAccessorsOf declaration: Declaration,
-        in context: Context
+        providingAccessorsOf declaration: some DeclSyntaxProtocol,
+        in context: some MacroExpansionContext
     ) throws -> [AccessorDeclSyntax] {
         []
     }
diff --git a/WorkflowTesting/Sources/Internal/RenderExpectations.swift b/WorkflowTesting/Sources/Internal/RenderExpectations.swift
index e46500af0..061c4cb1c 100644
--- a/WorkflowTesting/Sources/Internal/RenderExpectations.swift
+++ b/WorkflowTesting/Sources/Internal/RenderExpectations.swift
@@ -19,7 +19,7 @@
 @testable import Workflow
 
 extension RenderTester {
-    internal class AnyExpectedWorkflow {
+    class AnyExpectedWorkflow {
         let workflowType: Any.Type
         let key: String
         let file: StaticString
@@ -33,7 +33,7 @@ extension RenderTester {
         }
     }
 
-    internal class ExpectedWorkflow<ExpectedWorkflowType: Workflow>: AnyExpectedWorkflow {
+    class ExpectedWorkflow<ExpectedWorkflowType: Workflow>: AnyExpectedWorkflow {
         let rendering: ExpectedWorkflowType.Rendering
         let output: ExpectedWorkflowType.Output?
         let assertions: (ExpectedWorkflowType) -> Void
@@ -48,7 +48,7 @@ extension RenderTester {
 }
 
 extension RenderTester {
-    internal class ExpectedSideEffect {
+    class ExpectedSideEffect {
         let key: AnyHashable
         let file: StaticString
         let line: UInt
@@ -62,10 +62,10 @@ extension RenderTester {
         func apply<ContextType>(context: ContextType) where ContextType: RenderContextType, ContextType.WorkflowType == WorkflowType {}
     }
 
-    internal final class ExpectedSideEffectWithAction<ActionType: WorkflowAction>: ExpectedSideEffect where ActionType.WorkflowType == WorkflowType {
+    final class ExpectedSideEffectWithAction<ActionType: WorkflowAction>: ExpectedSideEffect where ActionType.WorkflowType == WorkflowType {
         let action: ActionType
 
-        internal init(key: AnyHashable, action: ActionType, file: StaticString, line: UInt) {
+        init(key: AnyHashable, action: ActionType, file: StaticString, line: UInt) {
             self.action = action
             super.init(key: key, file: file, line: line)
         }
diff --git a/WorkflowTesting/Sources/Internal/RenderTester+TestContext.swift b/WorkflowTesting/Sources/Internal/RenderTester+TestContext.swift
index 8e9e299d6..62ce67e89 100644
--- a/WorkflowTesting/Sources/Internal/RenderTester+TestContext.swift
+++ b/WorkflowTesting/Sources/Internal/RenderTester+TestContext.swift
@@ -20,7 +20,7 @@ import XCTest
 @testable import Workflow
 
 extension RenderTester {
-    internal final class TestContext: RenderContextType {
+    final class TestContext: RenderContextType {
         var state: WorkflowType.State
         var expectedWorkflows: [AnyExpectedWorkflow]
         var expectedSideEffects: [AnyHashable: ExpectedSideEffect]
@@ -31,7 +31,7 @@ extension RenderTester {
 
         private var usedWorkflowKeys: Set<WorkflowKey> = []
 
-        internal init(
+        init(
             state: WorkflowType.State,
             expectedWorkflows: [AnyExpectedWorkflow],
             expectedSideEffects: [AnyHashable: ExpectedSideEffect],
@@ -48,21 +48,19 @@ extension RenderTester {
         func render<Child, Action>(workflow: Child, key: String, outputMap: @escaping (Child.Output) -> Action) -> Child.Rendering where Child: Workflow, Action: WorkflowAction, Action.WorkflowType == WorkflowType {
             let matchingTypes = expectedWorkflows.compactMap { $0 as? ExpectedWorkflow<Child> }
             guard let expectedWorkflow = matchingTypes.first(where: { $0.key == key }) else {
-                let sameTypeDifferentKeys = matchingTypes.map { $0.key }
-                let sameKeyDifferentTypes = expectedWorkflows.filter { $0.key == key }.map { $0.workflowType }
+                let sameTypeDifferentKeys = matchingTypes.map(\.key)
+                let sameKeyDifferentTypes = expectedWorkflows.filter { $0.key == key }.map(\.workflowType)
 
-                let diagnosticMessage: String
-
-                if sameTypeDifferentKeys.count == 1 {
-                    diagnosticMessage = "Expecting key \"\(sameTypeDifferentKeys[0])\"."
+                let diagnosticMessage = if sameTypeDifferentKeys.count == 1 {
+                    "Expecting key \"\(sameTypeDifferentKeys[0])\"."
                 } else if sameTypeDifferentKeys.count > 1 {
-                    diagnosticMessage = "Expecting key in \"\(sameTypeDifferentKeys)\"."
+                    "Expecting key in \"\(sameTypeDifferentKeys)\"."
                 } else if sameKeyDifferentTypes.count == 1 {
-                    diagnosticMessage = "Found expectation of type \(sameKeyDifferentTypes[0]) for key \"\(key)\"."
+                    "Found expectation of type \(sameKeyDifferentTypes[0]) for key \"\(key)\"."
                 } else if sameKeyDifferentTypes.count > 1 {
-                    diagnosticMessage = "Found expectations for types \(sameKeyDifferentTypes) with key \"\(key)\"."
+                    "Found expectations for types \(sameKeyDifferentTypes) with key \"\(key)\"."
                 } else {
-                    diagnosticMessage = """
+                    """
                     If this child Workflow is expected, please add a call to `expectWorkflow(...)` with the appropriate parameters before invoking `render()`.
                     """
                 }
@@ -91,7 +89,7 @@ extension RenderTester {
         }
 
         func makeSink<ActionType>(of actionType: ActionType.Type) -> Sink<ActionType> where ActionType: WorkflowAction, ActionType.WorkflowType == WorkflowType {
-            return Sink<ActionType> { action in
+            Sink<ActionType> { action in
                 self.apply(action: action)
             }
         }
@@ -121,7 +119,7 @@ extension RenderTester {
             appliedAction = AppliedAction(action)
             let output = action.apply(toState: &state)
 
-            if let output = output {
+            if let output {
                 XCTAssertNil(producedOutput, "Received multiple outputs in a single render test", file: file, line: line)
                 producedOutput = output
             }
diff --git a/WorkflowTesting/Sources/RenderTesterResult.swift b/WorkflowTesting/Sources/RenderTesterResult.swift
index 822a37cee..b019d73dd 100644
--- a/WorkflowTesting/Sources/RenderTesterResult.swift
+++ b/WorkflowTesting/Sources/RenderTesterResult.swift
@@ -25,7 +25,7 @@ public struct RenderTesterResult<WorkflowType: Workflow> {
     let appliedAction: AppliedAction<WorkflowType>?
     let output: WorkflowType.Output?
 
-    internal init(initialState: WorkflowType.State, state: WorkflowType.State, appliedAction: AppliedAction<WorkflowType>?, output: WorkflowType.Output?) {
+    init(initialState: WorkflowType.State, state: WorkflowType.State, appliedAction: AppliedAction<WorkflowType>?, output: WorkflowType.Output?) {
         self.initialState = initialState
         self.state = state
         self.appliedAction = appliedAction
@@ -49,7 +49,7 @@ public struct RenderTesterResult<WorkflowType: Workflow> {
         file: StaticString = #file,
         line: UInt = #line
     ) -> RenderTesterResult<WorkflowType> {
-        if let appliedAction = appliedAction {
+        if let appliedAction {
             XCTFail("Expected no action, but got \(appliedAction.erasedAction).", file: file, line: line)
         }
         return self
@@ -63,7 +63,7 @@ public struct RenderTesterResult<WorkflowType: Workflow> {
         line: UInt = #line,
         assertions: (ActionType) throws -> Void
     ) rethrows -> RenderTesterResult<WorkflowType> where ActionType.WorkflowType == WorkflowType {
-        guard let appliedAction = appliedAction else {
+        guard let appliedAction else {
             XCTFail("No action was produced", file: file, line: line)
             return self
         }
@@ -78,7 +78,7 @@ public struct RenderTesterResult<WorkflowType: Workflow> {
         file: StaticString = #file,
         line: UInt = #line
     ) -> RenderTesterResult<WorkflowType> where ActionType.WorkflowType == WorkflowType, ActionType: Equatable {
-        return verifyAction(file: file, line: line) { appliedAction in
+        verifyAction(file: file, line: line) { appliedAction in
             XCTAssertEqual(appliedAction, action, file: file, line: line)
         }
     }
@@ -89,7 +89,7 @@ public struct RenderTesterResult<WorkflowType: Workflow> {
         file: StaticString = #file,
         line: UInt = #line
     ) -> RenderTesterResult<WorkflowType> {
-        if let output = output {
+        if let output {
             XCTFail("Expected no output, but got \(output).", file: file, line: line)
         }
         return self
@@ -102,7 +102,7 @@ public struct RenderTesterResult<WorkflowType: Workflow> {
         line: UInt = #line,
         assertions: (WorkflowType.Output) throws -> Void
     ) rethrows -> RenderTesterResult<WorkflowType> {
-        guard let output = output else {
+        guard let output else {
             XCTFail("No output was produced", file: file, line: line)
             return self
         }
@@ -133,7 +133,7 @@ extension RenderTesterResult where WorkflowType.State: Equatable {
         line: UInt = #line,
         _ modifications: (inout WorkflowType.State) throws -> Void
     ) rethrows -> RenderTesterResult<WorkflowType> {
-        var initialState = self.initialState
+        var initialState = initialState
         try modifications(&initialState)
         XCTAssertEqual(state, initialState, "Expected state does not match", file: file, line: line)
         return self
@@ -148,7 +148,7 @@ extension RenderTesterResult where WorkflowType.Output: Equatable {
         file: StaticString = #file,
         line: UInt = #line
     ) -> RenderTesterResult<WorkflowType> {
-        return verifyOutput(file: file, line: line) { output in
+        verifyOutput(file: file, line: line) { output in
             XCTAssertEqual(output, expectedOutput, file: file, line: line)
         }
     }
diff --git a/WorkflowTesting/Sources/WorkflowActionTester.swift b/WorkflowTesting/Sources/WorkflowActionTester.swift
index f0458ae6b..ecc4bc338 100644
--- a/WorkflowTesting/Sources/WorkflowActionTester.swift
+++ b/WorkflowTesting/Sources/WorkflowActionTester.swift
@@ -20,7 +20,7 @@ import XCTest
 extension WorkflowAction {
     /// Returns a state tester containing `self`.
     public static func tester(withState state: WorkflowType.State) -> WorkflowActionTester<WorkflowType, Self> {
-        return WorkflowActionTester(state: state)
+        WorkflowActionTester(state: state)
     }
 }
 
@@ -61,8 +61,8 @@ extension WorkflowAction {
 /// ```
 public struct WorkflowActionTester<WorkflowType, Action> where Action: WorkflowAction, Action.WorkflowType == WorkflowType {
     /// The current state
-    internal let state: WorkflowType.State
-    internal let output: WorkflowType.Output?
+    let state: WorkflowType.State
+    let output: WorkflowType.Output?
 
     /// Initializes a new state tester
     fileprivate init(state: WorkflowType.State, output: WorkflowType.Output? = nil) {
@@ -90,7 +90,7 @@ public struct WorkflowActionTester<WorkflowType, Action> where Action: WorkflowA
         file: StaticString = #file,
         line: UInt = #line
     ) -> WorkflowActionTester<WorkflowType, Action> {
-        if let output = output {
+        if let output {
             XCTFail("Expected no output, but got \(output).", file: file, line: line)
         }
         return self
@@ -108,7 +108,7 @@ public struct WorkflowActionTester<WorkflowType, Action> where Action: WorkflowA
         line: UInt = #line,
         _ assertions: (WorkflowType.Output) throws -> Void
     ) rethrows -> WorkflowActionTester<WorkflowType, Action> {
-        guard let output = output else {
+        guard let output else {
             XCTFail("No output was produced", file: file, line: line)
             return self
         }
@@ -142,7 +142,7 @@ extension WorkflowActionTester where WorkflowType.State: Equatable {
     /// - returns: A tester containing the current state and output.
     @discardableResult
     public func assert(state expectedState: WorkflowType.State, file: StaticString = #file, line: UInt = #line) -> WorkflowActionTester<WorkflowType, Action> {
-        return verifyState { actualState in
+        verifyState { actualState in
             XCTAssertEqual(actualState, expectedState, file: file, line: line)
         }
     }
@@ -156,7 +156,7 @@ extension WorkflowActionTester where WorkflowType.Output: Equatable {
     /// - returns: A tester containing the current state and output.
     @discardableResult
     public func assert(output expectedOutput: WorkflowType.Output, file: StaticString = #file, line: UInt = #line) -> WorkflowActionTester<WorkflowType, Action> {
-        return verifyOutput { actualOutput in
+        verifyOutput { actualOutput in
             XCTAssertEqual(actualOutput, expectedOutput, file: file, line: line)
         }
     }
diff --git a/WorkflowTesting/Sources/WorkflowRenderTester.swift b/WorkflowTesting/Sources/WorkflowRenderTester.swift
index 6c2d34fc9..9846c60d8 100644
--- a/WorkflowTesting/Sources/WorkflowRenderTester.swift
+++ b/WorkflowTesting/Sources/WorkflowRenderTester.swift
@@ -22,14 +22,14 @@
 import XCTest
 @testable import Workflow
 
-public extension Workflow {
+extension Workflow {
     /// Returns a `RenderTester` with a specified initial state.
-    func renderTester(initialState: Self.State) -> RenderTester<Self> {
+    public func renderTester(initialState: Self.State) -> RenderTester<Self> {
         RenderTester(workflow: self, state: initialState)
     }
 
     /// Returns a `RenderTester` with an initial state provided by `self.makeInitialState()`
-    func renderTester() -> RenderTester<Self> {
+    public func renderTester() -> RenderTester<Self> {
         renderTester(initialState: makeInitialState())
     }
 }
@@ -283,14 +283,14 @@ public struct RenderTester<WorkflowType: Workflow> {
     }
 }
 
-fileprivate extension Collection {
-    func appending(_ element: Element) -> [Element] {
+extension Collection {
+    fileprivate func appending(_ element: Element) -> [Element] {
         self + [element]
     }
 }
 
-fileprivate extension Dictionary {
-    func setting(key: Key, value: Value) -> [Key: Value] {
+extension Dictionary {
+    fileprivate func setting(key: Key, value: Value) -> [Key: Value] {
         var newDictionary = self
         newDictionary[key] = value
         return newDictionary
diff --git a/WorkflowTesting/Tests/WorkflowRenderTesterFailureTests.swift b/WorkflowTesting/Tests/WorkflowRenderTesterFailureTests.swift
index 879e188f5..ed7ed7c12 100644
--- a/WorkflowTesting/Tests/WorkflowRenderTesterFailureTests.swift
+++ b/WorkflowTesting/Tests/WorkflowRenderTesterFailureTests.swift
@@ -407,9 +407,9 @@ private enum TestAction: WorkflowAction, Equatable {
     func apply(toState state: inout TestWorkflow.State) -> TestWorkflow.Output? {
         switch self {
         case .noop:
-            return nil
+            nil
         case .sendOutput(let string):
-            return .string(string)
+            .string(string)
         }
     }
 }
diff --git a/WorkflowTesting/Tests/WorkflowRenderTesterTests.swift b/WorkflowTesting/Tests/WorkflowRenderTesterTests.swift
index 61f6f1bcf..9852ab17e 100644
--- a/WorkflowTesting/Tests/WorkflowRenderTesterTests.swift
+++ b/WorkflowTesting/Tests/WorkflowRenderTesterTests.swift
@@ -272,7 +272,7 @@ private struct OutputWorkflow: Workflow {
         func apply(toState state: inout OutputWorkflow.State) -> OutputWorkflow.Output? {
             switch self {
             case .emit:
-                return .success
+                .success
             }
         }
     }
diff --git a/WorkflowUI/Sources/Hosting/WorkflowHostingController.swift b/WorkflowUI/Sources/Hosting/WorkflowHostingController.swift
index 687d24517..bad7fd9dd 100644
--- a/WorkflowUI/Sources/Hosting/WorkflowHostingController.swift
+++ b/WorkflowUI/Sources/Hosting/WorkflowHostingController.swift
@@ -27,7 +27,7 @@ public final class WorkflowHostingController<ScreenType, Output>: WorkflowUIView
 
     /// Emits output events from the bound workflow.
     public var output: Signal<Output, Never> {
-        return workflowHost.output
+        workflowHost.output
     }
 
     /// An environment customization that will be applied to the environment of the root screen.
@@ -84,11 +84,11 @@ public final class WorkflowHostingController<ScreenType, Output>: WorkflowUIView
             .signal
             .take(during: lifetime)
             .observeValues { [weak self] screen in
-                guard let self = self else { return }
+                guard let self else { return }
 
-                self.update(
+                update(
                     screen: screen,
-                    environmentAncestorPath: self.environmentAncestorPath
+                    environmentAncestorPath: environmentAncestorPath
                 )
             }
     }
@@ -98,6 +98,7 @@ public final class WorkflowHostingController<ScreenType, Output>: WorkflowUIView
         workflowHost.update(workflow: workflow.asAnyWorkflow())
     }
 
+    @available(*, unavailable)
     public required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -149,31 +150,31 @@ public final class WorkflowHostingController<ScreenType, Output>: WorkflowUIView
     }
 
     override public var childForStatusBarStyle: UIViewController? {
-        return rootViewController
+        rootViewController
     }
 
     override public var childForStatusBarHidden: UIViewController? {
-        return rootViewController
+        rootViewController
     }
 
     override public var childForHomeIndicatorAutoHidden: UIViewController? {
-        return rootViewController
+        rootViewController
     }
 
     override public var childForScreenEdgesDeferringSystemGestures: UIViewController? {
-        return rootViewController
+        rootViewController
     }
 
     override public var supportedInterfaceOrientations: UIInterfaceOrientationMask {
-        return rootViewController.supportedInterfaceOrientations
+        rootViewController.supportedInterfaceOrientations
     }
 
     override public var preferredStatusBarUpdateAnimation: UIStatusBarAnimation {
-        return rootViewController.preferredStatusBarUpdateAnimation
+        rootViewController.preferredStatusBarUpdateAnimation
     }
 
     override public var childViewControllerForPointerLock: UIViewController? {
-        return rootViewController
+        rootViewController
     }
 
     override public func preferredContentSizeDidChange(
diff --git a/WorkflowUI/Sources/Observation/WorkflowUIViewController.swift b/WorkflowUI/Sources/Observation/WorkflowUIViewController.swift
index 0349b7617..a72cdb9ca 100644
--- a/WorkflowUI/Sources/Observation/WorkflowUIViewController.swift
+++ b/WorkflowUI/Sources/Observation/WorkflowUIViewController.swift
@@ -28,8 +28,8 @@ open class WorkflowUIViewController: UIViewController {
     /// Observation event emission point.
     /// - Parameter event: The event forwarded to any observers.
     @_spi(ExperimentalObservation)
-    public final func sendObservationEvent<E: WorkflowUIEvent>(
-        _ event: @autoclosure () -> E
+    public final func sendObservationEvent(
+        _ event: @autoclosure () -> some WorkflowUIEvent
     ) {
         WorkflowUIObservation
             .sharedUIObserver?
diff --git a/WorkflowUI/Sources/Screen/AnyScreen/AnyScreen.swift b/WorkflowUI/Sources/Screen/AnyScreen/AnyScreen.swift
index 25f8833b9..671a00b0b 100644
--- a/WorkflowUI/Sources/Screen/AnyScreen/AnyScreen.swift
+++ b/WorkflowUI/Sources/Screen/AnyScreen/AnyScreen.swift
@@ -22,7 +22,7 @@ public struct AnyScreen: Screen {
     /// The original screen, retained for debugging
     public let wrappedScreen: Screen
 
-    public init<T: Screen>(_ screen: T) {
+    public init(_ screen: some Screen) {
         if let anyScreen = screen as? AnyScreen {
             self = anyScreen
             return
@@ -31,7 +31,7 @@ public struct AnyScreen: Screen {
     }
 
     public func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return wrappedScreen.viewControllerDescription(environment: environment)
+        wrappedScreen.viewControllerDescription(environment: environment)
     }
 }
 
diff --git a/WorkflowUI/Sources/Screen/ScreenViewController.swift b/WorkflowUI/Sources/Screen/ScreenViewController.swift
index 04660a36a..3dbe0499f 100644
--- a/WorkflowUI/Sources/Screen/ScreenViewController.swift
+++ b/WorkflowUI/Sources/Screen/ScreenViewController.swift
@@ -41,7 +41,7 @@ open class ScreenViewController<ScreenType: Screen>: WorkflowUIViewController {
     public private(set) final var screen: ScreenType
 
     public final var screenType: Screen.Type {
-        return ScreenType.self
+        ScreenType.self
     }
 
     private var previousEnvironment: ViewEnvironment
@@ -60,7 +60,7 @@ open class ScreenViewController<ScreenType: Screen>: WorkflowUIViewController {
     public final func update(screen: ScreenType) {
         let previousScreen = self.screen
         self.screen = screen
-        let previousEnvironment = self.previousEnvironment
+        let previousEnvironment = previousEnvironment
         self.previousEnvironment = environment
         screenDidChange(from: previousScreen, previousEnvironment: previousEnvironment)
     }
diff --git a/WorkflowUI/Sources/ViewControllerDescription/DescribedViewController.swift b/WorkflowUI/Sources/ViewControllerDescription/DescribedViewController.swift
index 84da4dba2..e909f9ccb 100644
--- a/WorkflowUI/Sources/ViewControllerDescription/DescribedViewController.swift
+++ b/WorkflowUI/Sources/ViewControllerDescription/DescribedViewController.swift
@@ -29,7 +29,7 @@ public final class DescribedViewController: WorkflowUIViewController {
         currentViewController.didMove(toParent: self)
     }
 
-    public convenience init<S: Screen>(screen: S, environment: ViewEnvironment) {
+    public convenience init(screen: some Screen, environment: ViewEnvironment) {
         self.init(description: screen.viewControllerDescription(environment: environment))
     }
 
@@ -62,7 +62,7 @@ public final class DescribedViewController: WorkflowUIViewController {
         }
     }
 
-    public func update<S: Screen>(screen: S, environment: ViewEnvironment) {
+    public func update(screen: some Screen, environment: ViewEnvironment) {
         update(description: screen.viewControllerDescription(environment: environment))
     }
 
@@ -81,31 +81,31 @@ public final class DescribedViewController: WorkflowUIViewController {
     }
 
     override public var childForStatusBarStyle: UIViewController? {
-        return currentViewController
+        currentViewController
     }
 
     override public var childForStatusBarHidden: UIViewController? {
-        return currentViewController
+        currentViewController
     }
 
     override public var childForHomeIndicatorAutoHidden: UIViewController? {
-        return currentViewController
+        currentViewController
     }
 
     override public var childForScreenEdgesDeferringSystemGestures: UIViewController? {
-        return currentViewController
+        currentViewController
     }
 
     override public var supportedInterfaceOrientations: UIInterfaceOrientationMask {
-        return currentViewController.supportedInterfaceOrientations
+        currentViewController.supportedInterfaceOrientations
     }
 
     override public var preferredStatusBarUpdateAnimation: UIStatusBarAnimation {
-        return currentViewController.preferredStatusBarUpdateAnimation
+        currentViewController.preferredStatusBarUpdateAnimation
     }
 
     override public var childViewControllerForPointerLock: UIViewController? {
-        return currentViewController
+        currentViewController
     }
 
     override public func preferredContentSizeDidChange(
diff --git a/WorkflowUI/Sources/ViewControllerDescription/UIViewController+Extensions.swift b/WorkflowUI/Sources/ViewControllerDescription/UIViewController+Extensions.swift
index b4c2b33d4..f087881b6 100644
--- a/WorkflowUI/Sources/ViewControllerDescription/UIViewController+Extensions.swift
+++ b/WorkflowUI/Sources/ViewControllerDescription/UIViewController+Extensions.swift
@@ -32,9 +32,9 @@ extension UpdateChildScreenViewController where Self: UIViewController {
     /// - parameter environment: The `environment` to used when updating the view controller.
     /// - parameter onChange: A callback called if the view controller instance changed.
     ///
-    public func update<VC: UIViewController, ScreenType: Screen>(
+    public func update<VC: UIViewController>(
         child: ReferenceWritableKeyPath<Self, VC>,
-        with screen: ScreenType,
+        with screen: some Screen,
         in environment: ViewEnvironment,
         onChange: (VC) -> Void = { _ in }
     ) {
@@ -78,7 +78,8 @@ extension UpdateChildScreenViewController where Self: UIViewController {
                 if
                     parent.isViewLoaded,
                     old.isViewLoaded,
-                    let container = old.view.superview {
+                    let container = old.view.superview
+                {
                     // We will only add the view to the hierarchy if
                     // the parent's view is loaded, and the existing view
                     // is loaded, and the old view was in a superview.
diff --git a/WorkflowUI/Sources/ViewControllerDescription/ViewControllerDescription.swift b/WorkflowUI/Sources/ViewControllerDescription/ViewControllerDescription.swift
index afac31096..efd66a03e 100644
--- a/WorkflowUI/Sources/ViewControllerDescription/ViewControllerDescription.swift
+++ b/WorkflowUI/Sources/ViewControllerDescription/ViewControllerDescription.swift
@@ -200,7 +200,7 @@ extension ViewControllerDescription {
         ///
         /// If your view controller type can change between updates, call this method before invoking `update(viewController:)`.
         public func canUpdate(viewController: UIViewController) -> Bool {
-            return checkViewControllerType(viewController)
+            checkViewControllerType(viewController)
         }
 
         // MARK: Hashable
@@ -219,9 +219,8 @@ extension ViewControllerDescription {
 
 extension ViewControllerDescription {
     fileprivate class PropagationNode: ViewEnvironmentObserving {
-
         // Since the viewController retains a reference to this node (via capture in the `environmentAncestorOverride`
-        // closure) we use a weak reference here to avoid a retain cycle, and leave retainment of the view controller 
+        // closure) we use a weak reference here to avoid a retain cycle, and leave retainment of the view controller
         // up to the consumer of the `ViewControllerDescription` (e.g. the parent view controller).
         weak var viewController: UIViewController?
 
diff --git a/WorkflowUI/Tests/DescribedViewControllerTests.swift b/WorkflowUI/Tests/DescribedViewControllerTests.swift
index 84279bec9..14c4915b8 100644
--- a/WorkflowUI/Tests/DescribedViewControllerTests.swift
+++ b/WorkflowUI/Tests/DescribedViewControllerTests.swift
@@ -180,7 +180,7 @@ class DescribedViewControllerTests: XCTestCase {
         let WorkflowHostingController = WorkflowHostingController(describedViewController: describedViewController)
 
         // When
-        let expectation = self.expectation(description: "did observe size changes")
+        let expectation = expectation(description: "did observe size changes")
         expectation.expectedFulfillmentCount = 2
 
         var observedSizes: [CGSize] = []
@@ -210,7 +210,7 @@ class DescribedViewControllerTests: XCTestCase {
         let WorkflowHostingController = WorkflowHostingController(describedViewController: describedViewController)
 
         // When
-        let expectation = self.expectation(description: "did observe size changes")
+        let expectation = expectation(description: "did observe size changes")
         expectation.expectedFulfillmentCount = 3
 
         var observedSizes: [CGSize] = []
@@ -246,14 +246,14 @@ fileprivate enum TestScreen: Screen, Equatable {
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
         switch self {
         case .counter(let count):
-            return ViewControllerDescription(
+            ViewControllerDescription(
                 environment: environment,
                 build: { CounterViewController(count: count) },
                 update: { $0.count = count }
             )
 
         case .message(let message):
-            return ViewControllerDescription(
+            ViewControllerDescription(
                 environment: environment,
                 build: { MessageViewController(message: message) },
                 update: { $0.message = message }
@@ -265,7 +265,7 @@ fileprivate enum TestScreen: Screen, Equatable {
 fileprivate class WorkflowHostingController: UIViewController {
     let describedViewController: DescribedViewController
 
-    var preferredContentSizeSignal: Signal<CGSize, Never> { return signal.skipRepeats() }
+    var preferredContentSizeSignal: Signal<CGSize, Never> { signal.skipRepeats() }
 
     private let (signal, sink) = Signal<CGSize, Never>.pipe()
 
diff --git a/WorkflowUI/Tests/UIViewControllerExtensionTests.swift b/WorkflowUI/Tests/UIViewControllerExtensionTests.swift
index 6580cce63..4417d80d6 100644
--- a/WorkflowUI/Tests/UIViewControllerExtensionTests.swift
+++ b/WorkflowUI/Tests/UIViewControllerExtensionTests.swift
@@ -128,6 +128,7 @@ private final class RootVC: UIViewController {
         content.didMove(toParent: self)
     }
 
+    @available(*, unavailable)
     required init?(coder: NSCoder) { fatalError() }
 
     override func loadView() {
diff --git a/WorkflowUI/Tests/ViewControllerDescriptionTests.swift b/WorkflowUI/Tests/ViewControllerDescriptionTests.swift
index 5f6c18515..dbe289a53 100644
--- a/WorkflowUI/Tests/ViewControllerDescriptionTests.swift
+++ b/WorkflowUI/Tests/ViewControllerDescriptionTests.swift
@@ -135,6 +135,8 @@ class ViewControllerDescriptionTests: XCTestCase {
                 self.onEnvironmentDidChange = onEnvironmentDidChange
                 super.init(nibName: nil, bundle: nil)
             }
+
+            @available(*, unavailable)
             required init?(coder: NSCoder) { fatalError() }
             func environmentDidChange() { onEnvironmentDidChange(environment) }
         }
@@ -184,7 +186,7 @@ class ViewControllerDescriptionTests: XCTestCase {
 
         struct MyScreen: Screen {
             func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-                return MyScreenViewController.description(for: self, environment: environment)
+                MyScreenViewController.description(for: self, environment: environment)
             }
         }
 
diff --git a/WorkflowUI/Tests/WorkflowHostingControllerTests.swift b/WorkflowUI/Tests/WorkflowHostingControllerTests.swift
index fa1fd9141..3eea06dcf 100644
--- a/WorkflowUI/Tests/WorkflowHostingControllerTests.swift
+++ b/WorkflowUI/Tests/WorkflowHostingControllerTests.swift
@@ -29,7 +29,7 @@ fileprivate struct TestScreen: Screen {
     var onEnvironmentDidChange: ((ViewEnvironment) -> Void)?
 
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return TestScreenViewController.description(for: self, environment: environment)
+        TestScreenViewController.description(for: self, environment: environment)
     }
 }
 
@@ -291,7 +291,7 @@ fileprivate struct SubscribingWorkflow: Workflow {
     typealias Output = Int
 
     func makeInitialState() -> State {
-        return 0
+        0
     }
 
     func render(state: State, context: RenderContext<Self>) -> TestScreen {
@@ -315,7 +315,7 @@ fileprivate struct PassthroughWorkflow: Workflow {
     typealias Output = Never
 
     func render(state: State, context: RenderContext<Self>) -> TestScreen {
-        return TestScreen(string: value)
+        TestScreen(string: value)
     }
 }
 
@@ -330,11 +330,11 @@ fileprivate struct EchoWorkflow: Workflow {
         var value: Int
 
         func run() -> SignalProducer<Int, Never> {
-            return SignalProducer(value: value)
+            SignalProducer(value: value)
         }
 
         func isEquivalent(to otherWorker: Self) -> Bool {
-            return value == otherWorker.value
+            value == otherWorker.value
         }
     }
 
@@ -355,7 +355,7 @@ fileprivate struct EnvironmentObservingWorkflow: Workflow {
     typealias Output = Never
 
     func render(state: State, context: RenderContext<Self>) -> TestScreen {
-        return TestScreen(string: value, onEnvironmentDidChange: onEnvironmentDidChange)
+        TestScreen(string: value, onEnvironmentDidChange: onEnvironmentDidChange)
     }
 }
 
@@ -367,6 +367,7 @@ fileprivate final class EnvironmentCustomizingViewController: UIViewController,
         super.init(nibName: nil, bundle: nil)
     }
 
+    @available(*, unavailable)
     required init?(coder: NSCoder) { fatalError() }
 
     func customize(environment: inout ViewEnvironment) {
diff --git a/WorkflowUI/Tests/WorkflowUIObservationTestCase.swift b/WorkflowUI/Tests/WorkflowUIObservationTestCase.swift
index 38815319a..1eefd44f4 100644
--- a/WorkflowUI/Tests/WorkflowUIObservationTestCase.swift
+++ b/WorkflowUI/Tests/WorkflowUIObservationTestCase.swift
@@ -74,13 +74,13 @@ open class WorkflowUIObservationTestCase: XCTestCase {
 
 final class PublishingObserver: WorkflowUIObserver {
     let subject: PassthroughSubject<WorkflowUIEvent, Never>
-    private(set) lazy var publisher = { subject.eraseToAnyPublisher() }()
+    private(set) lazy var publisher = subject.eraseToAnyPublisher()
 
     init() {
         self.subject = .init()
     }
 
-    func observeEvent<E: WorkflowUIEvent>(_ event: E) {
+    func observeEvent(_ event: some WorkflowUIEvent) {
         subject.send(event)
     }
 }
diff --git a/WorkflowUI/Tests/WorkflowUIViewControllerTests.swift b/WorkflowUI/Tests/WorkflowUIViewControllerTests.swift
index 6b2124a91..3af3df777 100644
--- a/WorkflowUI/Tests/WorkflowUIViewControllerTests.swift
+++ b/WorkflowUI/Tests/WorkflowUIViewControllerTests.swift
@@ -255,8 +255,8 @@ private struct TestScreen: Screen {
     }
 }
 
-private extension ViewControllerDescription {
-    static var testing: Self {
+extension ViewControllerDescription {
+    fileprivate static var testing: Self {
         .init(
             environment: .empty,
             build: { UIViewController() },