diff --git a/Samples/AlertContainer/Sources/AlertContainerScreen.swift b/Samples/AlertContainer/Sources/AlertContainerScreen.swift
index dc84afe0d..fb9a6954a 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)
     }
 }
 
@@ -58,8 +58,8 @@ public struct AlertAction {
     }
 }
 
-extension AlertAction {
-    public enum Style {
+public extension AlertAction {
+    enum Style {
         case `default`
         case cancel
         case destructive
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..8df708fa0 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,21 +25,21 @@ 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)
     }
 }
 
-extension BackStackScreen {
+public extension BackStackScreen {
     /// A specific item in the back stack. The key and screen type is used to differentiate reused vs replaced screens.
-    public struct Item {
+    struct Item {
         public var key: AnyHashable
         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)
         }
@@ -73,15 +73,15 @@ extension BackStackScreen {
     }
 }
 
-extension BackStackScreen {
-    public enum BarVisibility {
+public extension BackStackScreen {
+    enum BarVisibility {
         case hidden
         case visible(BarContent)
     }
 }
 
-extension BackStackScreen {
-    public struct BarContent {
+public extension BackStackScreen {
+    struct BarContent {
         var title: Title
         var leftItem: BarButtonItem
         var rightItem: BarButtonItem
@@ -103,18 +103,18 @@ extension BackStackScreen {
     }
 }
 
-extension BackStackScreen.BarContent {
-    public enum Title {
+public extension BackStackScreen.BarContent {
+    enum Title {
         case none
         case text(String)
     }
 
-    public enum ButtonContent {
+    enum ButtonContent {
         case text(String)
         case icon(UIImage)
     }
 
-    public struct Button {
+    struct Button {
         var content: ButtonContent
         var handler: () -> Void
 
@@ -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..1897bcf35 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
@@ -228,9 +228,9 @@ private struct ModallyPresentedScreen {
     }
 }
 
-extension ModalContainerScreenModal {
-    fileprivate var identifier: ModalIdentifier {
-        return ModalIdentifier(
+private extension ModalContainerScreenModal {
+    var identifier: 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..59bedb264 100644
--- a/Samples/SplitScreenContainer/Sources/Environment+SplitScreen.swift
+++ b/Samples/SplitScreenContainer/Sources/Environment+SplitScreen.swift
@@ -27,9 +27,9 @@ public enum SplitScreenPosition {
     case trailing
 }
 
-extension ViewEnvironment {
-    public internal(set) var splitScreenPosition: SplitScreenPosition {
-        get { return self[SplitScreenPositionKey.self] }
+public extension ViewEnvironment {
+    internal(set) var splitScreenPosition: SplitScreenPosition {
+        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..50186e9b8 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,7 +49,7 @@ 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)
     }
 }
 
diff --git a/Samples/SplitScreenContainer/Sources/SplitScreenContainerViewController.swift b/Samples/SplitScreenContainer/Sources/SplitScreenContainerViewController.swift
index 424b2bcce..1a56f803a 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
@@ -121,6 +121,6 @@ internal final class SplitScreenContainerViewController<LeadingScreenType: Scree
 
 private extension UIViewController {
     var isLayoutDirectionRightToLeft: Bool {
-        return traitCollection.layoutDirection == .rightToLeft
+        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..cfa649cf4 100644
--- a/Samples/Tuist/ProjectDescriptionHelpers/Project+Workflow.swift
+++ b/Samples/Tuist/ProjectDescriptionHelpers/Project+Workflow.swift
@@ -5,9 +5,8 @@ public let workflowBundleIdPrefix = "com.squareup.workflow"
 public let workflowDestinations: ProjectDescription.Destinations = .iOS
 public let workflowDeploymentTargets: DeploymentTargets = .iOS("15.0")
 
-extension Target {
-    
-    public static func app(
+public extension Target {
+    static func app(
         name: String,
         sources: ProjectDescription.SourceFilesList,
         resources: ProjectDescription.ResourceFileElements? = nil,
@@ -29,8 +28,8 @@ extension Target {
             dependencies: dependencies
         )
     }
-    
-    public static func target(
+
+    static func target(
         name: String,
         sources: ProjectDescription.SourceFilesList? = nil,
         resources: ProjectDescription.ResourceFileElements? = nil,
@@ -47,13 +46,13 @@ extension Target {
             dependencies: dependencies
         )
     }
-    
-    public static func unitTest(
+
+    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..2c0e3458e 100644
--- a/Samples/Workspace.swift
+++ b/Samples/Workspace.swift
@@ -25,9 +25,8 @@ let workspace = Workspace(
     ]
 )
 
-
-extension Scheme {
-    public static func workflow(_ target: String) -> Self {
+public extension Scheme {
+    static func workflow(_ target: String) -> Self {
         .scheme(
             name: target,
             buildAction: .buildAction(targets: [.project(path: "..", target: target)])
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..a1c37b13c 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.
@@ -77,10 +77,10 @@ public protocol ViewEnvironmentObserving: ViewEnvironmentPropagating {
     func environmentDidChange()
 }
 
-extension ViewEnvironmentObserving {
-    public func customize(environment: inout ViewEnvironment) {}
+public extension ViewEnvironmentObserving {
+    func customize(environment: inout ViewEnvironment) {}
 
-    public func apply(environment: ViewEnvironment) {}
+    func apply(environment: ViewEnvironment) {}
 
-    public func environmentDidChange() {}
+    func environmentDidChange() {}
 }
diff --git a/ViewEnvironmentUI/Sources/ViewEnvironmentPropagating.swift b/ViewEnvironmentUI/Sources/ViewEnvironmentPropagating.swift
index 8f53981cc..5be591834 100644
--- a/ViewEnvironmentUI/Sources/ViewEnvironmentPropagating.swift
+++ b/ViewEnvironmentUI/Sources/ViewEnvironmentPropagating.swift
@@ -92,7 +92,7 @@ public protocol ViewEnvironmentPropagating: AnyObject {
     func setNeedsApplyEnvironment()
 }
 
-extension ViewEnvironmentPropagating {
+public extension ViewEnvironmentPropagating {
     /// The `ViewEnvironment` that is flowing through the propagation hierarchy.
     ///
     /// If you'd like to provide overrides for the environment as it flows through a node, you should conform to
@@ -116,7 +116,7 @@ extension ViewEnvironmentPropagating {
     /// - Important: `UIViewController` and `UIView` conformers _must_ call `applyEnvironmentIfNeeded()` in
     ///   `viewWillLayoutSubviews()` and `layoutSubviews()` respectively.
     ///
-    public var environment: ViewEnvironment {
+    var environment: ViewEnvironment {
         var environment = environmentAncestor?.environment ?? .empty
 
         for storedCustomization in customizations {
@@ -135,7 +135,7 @@ extension ViewEnvironmentPropagating {
     ///
     /// This will call `apply(environment:)` on the receiver if the node has been flagged for needing update.
     ///
-    public func applyEnvironmentIfNeeded() {
+    func applyEnvironmentIfNeeded() {
         guard needsEnvironmentUpdate else { return }
 
         needsEnvironmentUpdate = false
@@ -152,7 +152,7 @@ extension ViewEnvironmentPropagating {
     /// `environmentAncestor` is not `self` it will not be notified of needing update.
     ///
     @_spi(ViewEnvironmentWiring)
-    public func setNeedsEnvironmentUpdateOnAppropriateDescendants() {
+    func setNeedsEnvironmentUpdateOnAppropriateDescendants() {
         for descendant in environmentDescendants {
             // If the descendant's `environmentAncestor` is not `self` it has opted out of environment updates from this
             // node. The node is is likely acting as a root for propagation bridging purposes (e.g. from a Workflow
@@ -170,7 +170,7 @@ extension ViewEnvironmentPropagating {
     /// `cancel()` is called on it.
     ///
     @_spi(ViewEnvironmentWiring)
-    public func addEnvironmentNeedsUpdateObserver(
+    func addEnvironmentNeedsUpdateObserver(
         _ onNeedsUpdate: @escaping ViewEnvironmentUpdateObservation
     ) -> ViewEnvironmentUpdateObservationLifetime {
         let object = ViewEnvironmentUpdateObservationKey()
@@ -190,18 +190,18 @@ extension ViewEnvironmentPropagating {
     /// until `remove()` is called on it.
     ///
     @_spi(ViewEnvironmentWiring)
-    public func addEnvironmentCustomization(
+    func addEnvironmentCustomization(
         _ customization: @escaping ViewEnvironmentCustomization
     ) -> ViewEnvironmentCustomizationLifetime {
         let storedCustomization = StoredViewEnvironmentCustomization(customization: customization)
         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)
         }
     }
 
@@ -213,7 +213,7 @@ extension ViewEnvironmentPropagating {
     /// If no override is present, the return value will be `defaultEnvironmentAncestor`.
     ///
     @_spi(ViewEnvironmentWiring)
-    public var environmentAncestor: ViewEnvironmentPropagating? {
+    var environmentAncestor: ViewEnvironmentPropagating? {
         environmentAncestorOverride?() ?? defaultEnvironmentAncestor
     }
 
@@ -228,7 +228,7 @@ extension ViewEnvironmentPropagating {
     /// If no override is present, the return value will be `defaultEnvironmentDescendants`.
     ///
     @_spi(ViewEnvironmentWiring)
-    public var environmentDescendants: [ViewEnvironmentPropagating] {
+    var environmentDescendants: [ViewEnvironmentPropagating] {
         environmentDescendantsOverride?() ?? defaultEnvironmentDescendants
     }
 
@@ -236,7 +236,7 @@ extension ViewEnvironmentPropagating {
     /// - `environmentAncestorOverride`
     ///
     @_spi(ViewEnvironmentWiring)
-    public typealias EnvironmentAncestorProvider = () -> ViewEnvironmentPropagating?
+    typealias EnvironmentAncestorProvider = () -> ViewEnvironmentPropagating?
 
     /// This property allows you to override the propagation path of the `ViewEnvironment` as it flows through the
     /// node hierarchy by overriding the return value of `environmentAncestor`.
@@ -254,7 +254,7 @@ extension ViewEnvironmentPropagating {
     ///    control (e.g. Modals customization).
     ///
     @_spi(ViewEnvironmentWiring)
-    public var environmentAncestorOverride: EnvironmentAncestorProvider? {
+    var environmentAncestorOverride: EnvironmentAncestorProvider? {
         get {
             objc_getAssociatedObject(self, &AssociatedKeys.ancestorOverride) as? EnvironmentAncestorProvider
         }
@@ -272,7 +272,7 @@ extension ViewEnvironmentPropagating {
     /// - `environmentDescendantsOverride`
     ///
     @_spi(ViewEnvironmentWiring)
-    public typealias EnvironmentDescendantsProvider = () -> [ViewEnvironmentPropagating]
+    typealias EnvironmentDescendantsProvider = () -> [ViewEnvironmentPropagating]
 
     /// This property allows you to override the propagation path of the `ViewEnvironment` as it flows through the
     /// node hierarchy by overriding the return value of `environmentDescendants`.
@@ -288,7 +288,7 @@ extension ViewEnvironmentPropagating {
     ///    assertion.
     ///
     @_spi(ViewEnvironmentWiring)
-    public var environmentDescendantsOverride: EnvironmentDescendantsProvider? {
+    var environmentDescendantsOverride: EnvironmentDescendantsProvider? {
         get {
             objc_getAssociatedObject(self, &AssociatedKeys.descendantsOverride) as? EnvironmentDescendantsProvider
         }
@@ -312,7 +312,7 @@ extension ViewEnvironmentPropagating {
     /// references.
     ///
     @_spi(ViewEnvironmentWiring)
-    public var environmentAncestorPath: EnvironmentAncestorPath {
+    var environmentAncestorPath: EnvironmentAncestorPath {
         var path = EnvironmentAncestorPath()
 
         if let first = environmentAncestor {
@@ -325,7 +325,7 @@ extension ViewEnvironmentPropagating {
     }
 
     @_spi(ViewEnvironmentWiring)
-    public typealias EnvironmentAncestorPath = ViewEnvironmentPropagatingAncestorPath
+    typealias EnvironmentAncestorPath = ViewEnvironmentPropagatingAncestorPath
 }
 
 /// An `Equatable` representation of the `ViewEnvironmentPropagating` environment ancestor tree
@@ -507,8 +507,8 @@ public final class ViewEnvironmentCustomizationLifetime {
     }
 }
 
-extension ViewEnvironmentPropagating {
-    fileprivate var customizations: [StoredViewEnvironmentCustomization] {
+private extension ViewEnvironmentPropagating {
+    var customizations: [StoredViewEnvironmentCustomization] {
         get {
             objc_getAssociatedObject(
                 self,
diff --git a/ViewEnvironmentUI/Tests/ViewEnvironmentObservingTests.swift b/ViewEnvironmentUI/Tests/ViewEnvironmentObservingTests.swift
index 1167bd788..4535102e8 100644
--- a/ViewEnvironmentUI/Tests/ViewEnvironmentObservingTests.swift
+++ b/ViewEnvironmentUI/Tests/ViewEnvironmentObservingTests.swift
@@ -413,9 +413,9 @@ final class ViewEnvironmentObservingTests: XCTestCase {
 
 // MARK: - Helpers
 
-extension ViewEnvironmentObservingTests {
+fileprivate extension ViewEnvironmentObservingTests {
     @discardableResult
-    fileprivate func addToWindowMakingKeyAndVisible(_ viewController: UIViewController) -> UIWindow {
+    func addToWindowMakingKeyAndVisible(_ viewController: UIViewController) -> UIWindow {
         let window = UIWindow(
             frame: .init(
                 origin: .zero,
@@ -430,7 +430,7 @@ extension ViewEnvironmentObservingTests {
         return window
     }
 
-    fileprivate class TestViewEnvironmentObservingViewController: UIViewController, ViewEnvironmentObserving {
+    class TestViewEnvironmentObservingViewController: UIViewController, ViewEnvironmentObserving {
         var customizeEnvironment: (inout ViewEnvironment) -> Void
         var onApplyEnvironment: (ViewEnvironment) -> Void
 
@@ -458,10 +458,11 @@ extension ViewEnvironmentObservingTests {
             applyEnvironmentIfNeeded()
         }
 
+        @available(*, unavailable)
         required init?(coder: NSCoder) { fatalError("") }
     }
 
-    fileprivate class TestViewEnvironmentObservingView: UIView, ViewEnvironmentObserving {
+    class TestViewEnvironmentObservingView: UIView, ViewEnvironmentObserving {
         var customizeEnvironment: (inout ViewEnvironment) -> Void
         var onApplyEnvironment: (ViewEnvironment) -> Void
 
@@ -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..c01c7bd77 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,18 +56,18 @@ extension AnyWorkflow: Workflow {
     }
 
     public func asAnyWorkflow() -> AnyWorkflow<Rendering, Output> {
-        return self
+        self
     }
 }
 
-extension AnyWorkflow {
+public extension AnyWorkflow {
     /// Returns a new AnyWorkflow whose `Output` type has been transformed into the given type.
     ///
     /// - Parameter transform: An escaping closure that maps the original output type into the new output type.
     ///
     /// - 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)
+    func mapOutput<NewOutput>(_ transform: @escaping (Output) -> NewOutput) -> AnyWorkflow<Rendering, NewOutput> {
+        let storage = storage.mapOutput(transform: transform)
         return AnyWorkflow<Rendering, NewOutput>(storage: storage)
     }
 
@@ -76,8 +76,8 @@ extension AnyWorkflow {
     /// - Parameter transform: An escaping closure that maps the original rendering type into the new rendering type.
     ///
     /// - 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)
+    func mapRendering<NewRendering>(_ transform: @escaping (Rendering) -> NewRendering) -> AnyWorkflow<NewRendering, Output> {
+        let storage = storage.mapRendering(transform: transform)
         return AnyWorkflow<NewRendering, Output>(storage: storage)
     }
 
@@ -92,15 +92,15 @@ extension AnyWorkflow {
     /// 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)
+        storage.render(context: context, key: key, outputMap: outputMap)
     }
 }
 
-extension AnyWorkflow {
+private extension AnyWorkflow {
     /// This is the type erased outer API (referenced by the containing AnyWorkflow).
     ///
     /// This type is never used directly.
-    fileprivate class AnyStorage {
+    class AnyStorage {
         var base: Any { fatalError() }
 
         func render<Parent, Action>(context: RenderContext<Parent>, key: String, outputMap: @escaping (Output) -> Action) -> Rendering where Action: WorkflowAction, Action.WorkflowType == Parent {
@@ -123,7 +123,7 @@ extension AnyWorkflow {
     /// Subclass that adds type information about the underlying workflow implementation.
     ///
     /// This is the only type that is ever actually used by AnyWorkflow as storage.
-    fileprivate final class Storage<T: Workflow>: AnyStorage {
+    final class Storage<T: Workflow>: AnyStorage {
         let workflow: T
         let renderingTransform: (T.Rendering) -> Rendering
         let outputTransform: (T.Output) -> Output
@@ -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))
@@ -170,12 +170,12 @@ extension AnyWorkflow {
     }
 }
 
-extension AnyWorkflowConvertible {
-    public func mapOutput<NewOutput>(_ transform: @escaping (Output) -> NewOutput) -> AnyWorkflow<Rendering, NewOutput> {
-        return asAnyWorkflow().mapOutput(transform)
+public extension AnyWorkflowConvertible {
+    func mapOutput<NewOutput>(_ transform: @escaping (Output) -> NewOutput) -> AnyWorkflow<Rendering, NewOutput> {
+        asAnyWorkflow().mapOutput(transform)
     }
 
-    public func mapRendering<NewRendering>(_ transform: @escaping (Rendering) -> NewRendering) -> AnyWorkflow<NewRendering, Output> {
-        return asAnyWorkflow().mapRendering(transform)
+    func mapRendering<NewRendering>(_ transform: @escaping (Rendering) -> NewRendering) -> AnyWorkflow<NewRendering, Output> {
+        asAnyWorkflow().mapRendering(transform)
     }
 }
diff --git a/Workflow/Sources/AnyWorkflowConvertible.swift b/Workflow/Sources/AnyWorkflowConvertible.swift
index 6a78eed44..08f027ad5 100644
--- a/Workflow/Sources/AnyWorkflowConvertible.swift
+++ b/Workflow/Sources/AnyWorkflowConvertible.swift
@@ -27,7 +27,7 @@ public protocol AnyWorkflowConvertible<Rendering, Output> {
     func asAnyWorkflow() -> AnyWorkflow<Rendering, Output>
 }
 
-extension AnyWorkflowConvertible {
+public extension AnyWorkflowConvertible {
     /// Creates or updates a child workflow of the given type, performs a render pass, and returns the result.
     ///
     /// Note that it is a programmer error to render two instances of a given workflow type with the same `key`
@@ -37,20 +37,20 @@ extension AnyWorkflowConvertible {
     /// - Parameter key: A string that uniquely identifies this workflow.
     ///
     /// - 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 })
+    func rendered<Parent>(in context: RenderContext<Parent>, key: String = "") -> Rendering where Output: WorkflowAction, Output.WorkflowType == Parent {
+        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) })
+    func rendered<Parent, Action>(in context: RenderContext<Parent>, key: String = "", outputMap: @escaping (Output) -> Action) -> Rendering where Action: WorkflowAction, Action.WorkflowType == Parent {
+        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 })
+    func rendered<Parent>(in context: RenderContext<Parent>, key: String = "") -> Rendering where Output == AnyWorkflowAction<Parent> {
+        asAnyWorkflow().render(context: context, key: key, outputMap: { $0 })
     }
 }
 
-extension AnyWorkflowConvertible where Output == Never {
+public extension AnyWorkflowConvertible where Output == Never {
     /// Creates or updates a child workflow of the given type, performs a render pass, and returns the result.
     ///
     /// Note that it is a programmer error to render two instances of a given workflow type with the same `key`
@@ -60,10 +60,10 @@ extension AnyWorkflowConvertible where Output == Never {
     /// - Parameter key: A string that uniquely identifies this workflow.
     ///
     /// - Returns: The `Rendering` generated by the workflow.
-    public func rendered<T>(in context: RenderContext<T>, key: String = "") -> Rendering {
+    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,
@@ -72,26 +72,26 @@ extension AnyWorkflowConvertible where Output == Never {
     }
 }
 
-extension AnyWorkflowConvertible where Rendering == Void {
-    public func running<Parent, Action>(in context: RenderContext<Parent>, key: String = "", outputMap: @escaping (Output) -> Action) where Action: WorkflowAction, Action.WorkflowType == Parent {
+public extension AnyWorkflowConvertible where Rendering == Void {
+    func running<Parent, Action>(in context: RenderContext<Parent>, key: String = "", outputMap: @escaping (Output) -> Action) where Action: WorkflowAction, Action.WorkflowType == Parent {
         rendered(in: context, key: key, outputMap: outputMap)
     }
 }
 
-extension AnyWorkflowConvertible where Rendering == Void, Output: WorkflowAction {
-    public func running<Parent>(in context: RenderContext<Parent>, key: String = "") where Output.WorkflowType == Parent {
+public extension AnyWorkflowConvertible where Rendering == Void, Output: WorkflowAction {
+    func running<Parent>(in context: RenderContext<Parent>, key: String = "") where Output.WorkflowType == Parent {
         rendered(in: context, key: key)
     }
 }
 
 // MARK: -
 
-extension AnyWorkflowConvertible {
+public extension AnyWorkflowConvertible {
     /// Process an `Output`
     ///
     /// - 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()
+    func onOutput<Parent>(_ apply: @escaping ((inout Parent.State, Output) -> Parent.Output?)) -> AnyWorkflow<Rendering, AnyWorkflowAction<Parent>> {
+        asAnyWorkflow()
             .mapOutput { output in
                 AnyWorkflowAction { state -> Parent.Output? in
                     apply(&state, output)
@@ -100,11 +100,11 @@ extension AnyWorkflowConvertible {
     }
 }
 
-extension AnyWorkflowConvertible {
+public extension AnyWorkflowConvertible {
     /// Wraps this workflow in a workflow that ignores all outputs.
     ///
     /// - Returns: An `AnyWorkflow` with the same rendering and no output.
-    public func ignoringOutput() -> AnyWorkflow<Rendering, Never> {
+    func ignoringOutput() -> AnyWorkflow<Rendering, Never> {
         OutputBlockingWorkflow(child: self).asAnyWorkflow()
     }
 }
@@ -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..98ed429d6 100644
--- a/Workflow/Sources/Debugging.swift
+++ b/Workflow/Sources/Debugging.swift
@@ -18,14 +18,14 @@ 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
     }
 }
 
-extension WorkflowUpdateDebugInfo {
-    public indirect enum Kind: Equatable {
+public extension WorkflowUpdateDebugInfo {
+    indirect enum Kind: Equatable {
         case didUpdate(source: Source)
         case childDidUpdate(WorkflowUpdateDebugInfo)
     }
@@ -71,8 +71,8 @@ extension WorkflowUpdateDebugInfo.Kind: Codable {
     }
 }
 
-extension WorkflowUpdateDebugInfo {
-    public indirect enum Source: Equatable {
+public extension WorkflowUpdateDebugInfo {
+    indirect enum Source: Equatable {
         case external
         case worker
         case sideEffect
@@ -137,8 +137,8 @@ public struct WorkflowHierarchyDebugSnapshot: Codable, Equatable {
     }
 }
 
-extension WorkflowHierarchyDebugSnapshot {
-    public struct Child: Codable, Equatable {
+public extension WorkflowHierarchyDebugSnapshot {
+    struct Child: Codable, Equatable {
         public var key: String
         public var snapshot: WorkflowHierarchyDebugSnapshot
 
diff --git a/Workflow/Sources/DispatchQueue+Workflow.swift b/Workflow/Sources/DispatchQueue+Workflow.swift
index 00b119382..673214703 100644
--- a/Workflow/Sources/DispatchQueue+Workflow.swift
+++ b/Workflow/Sources/DispatchQueue+Workflow.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-extension DispatchQueue {
+public extension DispatchQueue {
     @_spi(WorkflowInternals)
-    public static let workflowExecution: DispatchQueue = .main
+    static let workflowExecution: DispatchQueue = .main
 }
diff --git a/Workflow/Sources/RenderContext.swift b/Workflow/Sources/RenderContext.swift
index 9c6b1fda7..43fe63e06 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
@@ -149,9 +149,9 @@ internal protocol RenderContextType: AnyObject {
     func runSideEffect(key: AnyHashable, action: (_ lifetime: Lifetime) -> Void)
 }
 
-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)
+public extension RenderContext {
+    func makeSink<Event>(of eventType: Event.Type, onEvent: @escaping (Event, inout WorkflowType.State) -> WorkflowType.Output?) -> Sink<Event> {
+        makeSink(of: AnyWorkflowAction.self)
             .contraMap { event in
                 AnyWorkflowAction<WorkflowType> { state in
                     onEvent(event, &state)
@@ -161,8 +161,8 @@ 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)
+    func makeOutputSink() -> Sink<WorkflowType.Output> {
+        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/StateMutationSink.swift b/Workflow/Sources/StateMutationSink.swift
index e2f7aa5b1..405a59e1a 100644
--- a/Workflow/Sources/StateMutationSink.swift
+++ b/Workflow/Sources/StateMutationSink.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-extension RenderContext {
+public extension RenderContext {
     /// Creates `StateMutationSink`.
     ///
     /// To create a sink:
@@ -28,7 +28,7 @@ extension RenderContext {
     /// ```
     /// stateMutationSink.send(\State.value, value: 10)
     /// ```
-    public func makeStateMutationSink() -> StateMutationSink<WorkflowType> {
+    func makeStateMutationSink() -> StateMutationSink<WorkflowType> {
         let sink = makeSink(of: AnyWorkflowAction<WorkflowType>.self)
         return StateMutationSink(sink)
     }
diff --git a/Workflow/Sources/SubtreeManager.swift b/Workflow/Sources/SubtreeManager.swift
index ca469a95f..10af75cb9 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 {
@@ -135,23 +135,23 @@ extension WorkflowNode.SubtreeManager {
 
 // MARK: - Render Context
 
-extension WorkflowNode.SubtreeManager {
+private extension WorkflowNode.SubtreeManager {
     /// The workflow context implementation used by the subtree manager.
-    fileprivate final class Context: RenderContextType {
-        internal private(set) var eventPipes: [EventPipe]
+    final class Context: RenderContextType {
+        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)
 
@@ -254,10 +255,10 @@ extension WorkflowNode.SubtreeManager {
 
 // MARK: - Reusable Sink
 
-extension WorkflowNode.SubtreeManager {
-    fileprivate struct SinkStore {
+private extension WorkflowNode.SubtreeManager {
+    struct SinkStore {
         var eventPipes: [EventPipe] {
-            return usedSinks.values.map { reusableSink -> EventPipe in
+            usedSinks.values.map { reusableSink -> EventPipe in
                 reusableSink.eventPipe
             }
         }
@@ -294,7 +295,7 @@ extension WorkflowNode.SubtreeManager {
     }
 
     /// Type-erased base class for reusable sinks.
-    fileprivate class AnyReusableSink {
+    class AnyReusableSink {
         var eventPipe: EventPipe
 
         init() {
@@ -302,7 +303,7 @@ extension WorkflowNode.SubtreeManager {
         }
     }
 
-    fileprivate final class ReusableSink<Action: WorkflowAction>: AnyReusableSink where Action.WorkflowType == WorkflowType {
+    final class ReusableSink<Action: WorkflowAction>: AnyReusableSink where Action.WorkflowType == WorkflowType {
         func handle(action: Action) {
             let output = Output.update(action, source: .external)
 
@@ -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..e34e6f172 100644
--- a/Workflow/Sources/Workflow.swift
+++ b/Workflow/Sources/Workflow.swift
@@ -81,22 +81,22 @@ public protocol Workflow<Rendering, Output>: AnyWorkflowConvertible {
     func render(state: State, context: RenderContext<Self>) -> Rendering
 }
 
-extension Workflow {
-    public func workflowDidChange(from previousWorkflow: Self, state: inout State) {}
+public extension Workflow {
+    func workflowDidChange(from previousWorkflow: Self, state: inout State) {}
 }
 
 /// When State is Void, provide empty `makeInitialState` and `workflowDidChange`
 /// implementations, making a “stateless workflow”.
-extension Workflow where State == Void {
-    public func makeInitialState() -> State {
-        return ()
+public extension Workflow where State == Void {
+    func makeInitialState() -> State {
+        ()
     }
 
-    public func workflowDidChange(from previousWorkflow: Self, state: inout State) {}
+    func workflowDidChange(from previousWorkflow: Self, state: inout State) {}
 }
 
-extension Workflow {
-    public func asAnyWorkflow() -> AnyWorkflow<Rendering, Output> {
-        return AnyWorkflow(self)
+public extension Workflow {
+    func asAnyWorkflow() -> AnyWorkflow<Rendering, Output> {
+        AnyWorkflow(self)
     }
 }
diff --git a/Workflow/Sources/WorkflowAction.swift b/Workflow/Sources/WorkflowAction.swift
index 260eb2f92..00887a69e 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,15 +80,15 @@ public struct AnyWorkflowAction<WorkflowType: Workflow>: WorkflowAction {
     }
 
     public func apply(toState state: inout WorkflowType.State) -> WorkflowType.Output? {
-        return _apply(&state)
+        _apply(&state)
     }
 }
 
-extension AnyWorkflowAction {
+public extension AnyWorkflowAction {
     /// Creates a type-erased workflow action that simply sends the given output event.
     ///
     /// - Parameter output: The output event to send when this action is applied.
-    public init(sendingOutput output: WorkflowType.Output) {
+    init(sendingOutput output: WorkflowType.Output) {
         self = AnyWorkflowAction { state in
             output
         }
@@ -96,8 +96,8 @@ 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
+    static var noAction: AnyWorkflowAction<WorkflowType> {
+        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..56d787679 100644
--- a/Workflow/Sources/WorkflowLogger.swift
+++ b/Workflow/Sources/WorkflowLogger.swift
@@ -24,9 +24,7 @@ private extension OSLog {
     /// 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
-    }()
+    static var active: OSLog = WorkflowLogging.isOSLoggingAllowed ? .workflow : .disabled
 }
 
 // MARK: -
@@ -34,12 +32,12 @@ private extension OSLog {
 /// Namespace for specifying logging configuration data.
 public enum WorkflowLogging {}
 
-extension WorkflowLogging {
+public extension WorkflowLogging {
     /// Flag indicating whether `OSLog` logs may be recorded. Note, actual emission of
     /// log statements in specific cases may depend on additional configuration options, so
     /// this being `true` does not necessarily imply logging will occur.
     @_spi(Logging)
-    public static let isOSLoggingAllowed: Bool = {
+    static let isOSLoggingAllowed: Bool = {
         let env = ProcessInfo.processInfo.environment
         guard let value = env["com.squareup.workflow.allowOSLogging"] else {
             return false
@@ -48,8 +46,8 @@ extension WorkflowLogging {
     }()
 }
 
-extension WorkflowLogging {
-    public struct Config {
+public extension WorkflowLogging {
+    struct Config {
         /// Configuration options to control logging during a render pass.
         public enum RenderLoggingMode {
             /// No data will be recorded for WorkflowNode render timings.
@@ -83,7 +81,7 @@ extension WorkflowLogging {
     ///
     /// If you wish for more control over what the runtime will log, you may additionally specify
     /// a custom value for `WorkflowLogging.config`.
-    public static var enabled: Bool {
+    static var enabled: Bool {
         get { OSLog.active === OSLog.workflow }
         set {
             guard isOSLoggingAllowed else { return }
@@ -92,18 +90,18 @@ extension WorkflowLogging {
     }
 
     /// Configuration options used to determine which activities are logged.
-    public static var config: Config = .rootRendersAndActions
+    static var config: Config = .rootRendersAndActions
 }
 
-extension WorkflowLogging.Config {
+public extension WorkflowLogging.Config {
     /// Logging config that will output the most information.
     /// Will also have the most noticeable effect on performance.
-    public static let debug: Self = .init(renderLoggingMode: .allNodes, logLifetimes: true, logActions: true)
+    static let debug: Self = .init(renderLoggingMode: .allNodes, logLifetimes: true, logActions: true)
 
     /// Logging config that will record render timings for root nodes as well as action events.
     /// This provides a reasonable performance tradeoff if you're interested in the runtime's behavior
     /// but don't wan to pay the price of logging everything.
-    public static let rootRendersAndActions: Self = .init(renderLoggingMode: .rootsOnly, logLifetimes: false, logActions: true)
+    static let rootRendersAndActions: Self = .init(renderLoggingMode: .rootsOnly, logLifetimes: false, logActions: true)
 }
 
 // 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..f3047ff55 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()
diff --git a/Workflow/Sources/WorkflowObserver.swift b/Workflow/Sources/WorkflowObserver.swift
index 2cf7f0385..67bb1c8f5 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
         }
     }
 
@@ -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..77dd5e0b0 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
diff --git a/Workflow/Tests/PerformanceTests.swift b/Workflow/Tests/PerformanceTests.swift
index bbc7bfd25..328bcb2b6 100644
--- a/Workflow/Tests/PerformanceTests.swift
+++ b/Workflow/Tests/PerformanceTests.swift
@@ -135,13 +135,11 @@ private extension PerformanceTests {
         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..b1154b5ea 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 {
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..f4ad55af2 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
         }
     }
 
@@ -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/Publisher+Extensions.swift b/WorkflowCombine/Sources/Publisher+Extensions.swift
index 0fa116986..842bdb554 100644
--- a/WorkflowCombine/Sources/Publisher+Extensions.swift
+++ b/WorkflowCombine/Sources/Publisher+Extensions.swift
@@ -15,17 +15,18 @@ import Workflow
 /// a previous solution had extending the `AnyPublisher` to conform to `AnyWorkflowConvertible`,
 /// but was limited in the fact that rendering was only available to `AnyPublisher`s.
 /// 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> {
+public extension Publisher where Failure == Never {
+    func running<Parent>(in context: RenderContext<Parent>, key: String = "") where
+        Output == AnyWorkflowAction<Parent>
+    {
         asAnyWorkflow().rendered(in: context, key: key, outputMap: { $0 })
     }
 
-    public func mapOutput<NewOutput>(_ transform: @escaping (Output) -> NewOutput) -> AnyWorkflow<Void, NewOutput> {
+    func mapOutput<NewOutput>(_ transform: @escaping (Output) -> NewOutput) -> AnyWorkflow<Void, NewOutput> {
         asAnyWorkflow().mapOutput(transform)
     }
 
-    public func asAnyWorkflow() -> AnyWorkflow<Void, Output> {
+    func asAnyWorkflow() -> AnyWorkflow<Void, Output> {
         PublisherWorkflow(publisher: self).asAnyWorkflow()
     }
 }
diff --git a/WorkflowCombine/Sources/Worker.swift b/WorkflowCombine/Sources/Worker.swift
index bf177e2de..74c4ae4fc 100644
--- a/WorkflowCombine/Sources/Worker.swift
+++ b/WorkflowCombine/Sources/Worker.swift
@@ -42,8 +42,8 @@ public protocol Worker<Output>: AnyWorkflowConvertible where Rendering == Void {
     func isEquivalent(to otherWorker: Self) -> Bool
 }
 
-extension Worker {
-    public func asAnyWorkflow() -> AnyWorkflow<Void, Output> {
+public extension Worker {
+    func asAnyWorkflow() -> AnyWorkflow<Void, Output> {
         WorkerWorkflow(worker: self).asAnyWorkflow()
     }
 }
@@ -89,8 +89,8 @@ struct WorkerWorkflow<WorkerType: Worker>: Workflow {
     }
 }
 
-extension Worker where Self: Equatable {
-    public func isEquivalent(to otherWorker: Self) -> Bool {
+public extension Worker where Self: Equatable {
+    func isEquivalent(to otherWorker: Self) -> Bool {
         self == otherWorker
     }
 }
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/Worker.swift b/WorkflowConcurrency/Sources/Worker.swift
index 4112b70e5..bb1bd25e9 100644
--- a/WorkflowConcurrency/Sources/Worker.swift
+++ b/WorkflowConcurrency/Sources/Worker.swift
@@ -38,8 +38,8 @@ public protocol Worker<Output>: AnyWorkflowConvertible where Rendering == Void {
     func isEquivalent(to otherWorker: Self) -> Bool
 }
 
-extension Worker {
-    public func asAnyWorkflow() -> AnyWorkflow<Void, Output> {
+public extension Worker {
+    func asAnyWorkflow() -> AnyWorkflow<Void, Output> {
         WorkerWorkflow(worker: self).asAnyWorkflow()
     }
 }
@@ -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()
@@ -83,8 +83,8 @@ struct WorkerWorkflow<WorkerType: Worker>: Workflow {
     }
 }
 
-extension Worker where Self: Equatable {
-    public func isEquivalent(to otherWorker: Self) -> Bool {
+public extension Worker where Self: Equatable {
+    func isEquivalent(to otherWorker: Self) -> Bool {
         self == otherWorker
     }
 }
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..bb7e5ff2a 100644
--- a/WorkflowReactiveSwift/Sources/Logger.swift
+++ b/WorkflowReactiveSwift/Sources/Logger.swift
@@ -20,8 +20,8 @@ import os.signpost
 // Namespace for Worker logging
 public enum WorkerLogging {}
 
-extension WorkerLogging {
-    public static var enabled: Bool {
+public extension WorkerLogging {
+    static var enabled: Bool {
         get { OSLog.active === OSLog.worker }
         set {
             guard WorkflowLogging.isOSLoggingAllowed else { return }
@@ -33,9 +33,7 @@ extension WorkerLogging {
 private extension OSLog {
     static let worker = OSLog(subsystem: "com.squareup.WorkflowReactiveSwift", category: "Worker")
 
-    static var active: OSLog = {
-        WorkflowLogging.isOSLoggingAllowed ? .worker : .disabled
-    }()
+    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..46d3f18a2 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()
     }
 }
 
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..1ff39816c 100644
--- a/WorkflowReactiveSwift/Sources/Worker.swift
+++ b/WorkflowReactiveSwift/Sources/Worker.swift
@@ -39,8 +39,8 @@ public protocol Worker<Output>: AnyWorkflowConvertible where Rendering == Void {
     func isEquivalent(to otherWorker: Self) -> Bool
 }
 
-extension Worker {
-    public func asAnyWorkflow() -> AnyWorkflow<Void, Output> {
+public extension Worker {
+    func asAnyWorkflow() -> AnyWorkflow<Void, Output> {
         WorkerWorkflow(worker: self).asAnyWorkflow()
     }
 }
@@ -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) }
@@ -90,8 +90,8 @@ private extension WorkerLogger {
     }
 }
 
-extension Worker where Self: Equatable {
-    public func isEquivalent(to otherWorker: Self) -> Bool {
+public extension Worker where Self: Equatable {
+    func isEquivalent(to otherWorker: Self) -> Bool {
         self == otherWorker
     }
 }
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..c81353e55 100644
--- a/WorkflowRxSwift/Sources/Logger.swift
+++ b/WorkflowRxSwift/Sources/Logger.swift
@@ -20,8 +20,8 @@ import os.signpost
 // Namespace for Worker logging
 public enum WorkerLogging {}
 
-extension WorkerLogging {
-    public static var enabled: Bool {
+public extension WorkerLogging {
+    static var enabled: Bool {
         get { OSLog.active === OSLog.worker }
         set {
             guard WorkflowLogging.isOSLoggingAllowed else { return }
@@ -33,9 +33,7 @@ extension WorkerLogging {
 private extension OSLog {
     static let worker = OSLog(subsystem: "com.squareup.WorkflowRxSwift", category: "Worker")
 
-    static var active: OSLog = {
-        WorkflowLogging.isOSLoggingAllowed ? .worker : .disabled
-    }()
+    static var active: OSLog = WorkflowLogging.isOSLoggingAllowed ? .worker : .disabled
 }
 
 // MARK: -
diff --git a/WorkflowRxSwift/Sources/Worker.swift b/WorkflowRxSwift/Sources/Worker.swift
index c06b9d909..c594c410d 100644
--- a/WorkflowRxSwift/Sources/Worker.swift
+++ b/WorkflowRxSwift/Sources/Worker.swift
@@ -39,8 +39,8 @@ public protocol Worker<Output>: AnyWorkflowConvertible where Rendering == Void {
     func isEquivalent(to otherWorker: Self) -> Bool
 }
 
-extension Worker {
-    public func asAnyWorkflow() -> AnyWorkflow<Void, Output> {
+public extension Worker {
+    func asAnyWorkflow() -> AnyWorkflow<Void, Output> {
         WorkerWorkflow(worker: self).asAnyWorkflow()
     }
 }
@@ -85,8 +85,8 @@ struct WorkerWorkflow<WorkerType: Worker>: Workflow {
     }
 }
 
-extension Worker where Self: Equatable {
-    public func isEquivalent(to otherWorker: Self) -> Bool {
+public extension Worker where Self: Equatable {
+    func isEquivalent(to otherWorker: Self) -> Bool {
         self == otherWorker
     }
 }
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/Store+Preview.swift b/WorkflowSwiftUI/Sources/Store+Preview.swift
index f31a4b246..6ab7f3a76 100644
--- a/WorkflowSwiftUI/Sources/Store+Preview.swift
+++ b/WorkflowSwiftUI/Sources/Store+Preview.swift
@@ -28,7 +28,7 @@ public struct StaticStorePreviewContext {
     }
 }
 
-extension Store {
+public extension Store {
     /// Generates a static store for previews.
     ///
     /// Previews generated with this method are static and do not update state. To generate a
@@ -38,7 +38,7 @@ 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.
-    public static func preview(
+    static func preview(
         makeModel: (StaticStorePreviewContext) -> Model
     ) -> Store {
         let context = StaticStorePreviewContext()
@@ -46,7 +46,7 @@ extension Store {
         let (store, _) = make(model: model)
         return store
     }
-    
+
     /// Generates a static store for previews.
     ///
     /// Previews generated with this method are static and do not update state. To generate a
@@ -55,14 +55,14 @@ extension Store {
     ///
     /// - Parameter state: The state of the view.
     /// - Returns: A store for previews.
-    public static func preview<State, Action>(
+    static func preview<State, Action>(
         state: State
     ) -> Store<ActionModel<State, Action>> where Model == ActionModel<State, Action> {
         preview { context in
             context.makeActionModel(state: state)
         }
     }
-    
+
     /// Generates a static store for previews.
     ///
     /// Previews generated with this method are static and do not update state. To generate a
@@ -71,7 +71,7 @@ extension Store {
     ///
     /// - Parameter state: The state of the view.
     /// - Returns: A store for previews.
-    public static func preview<State>(
+    static func preview<State>(
         state: State
     ) -> Store<StateAccessor<State>> where Model == StateAccessor<State> {
         preview { context in
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.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/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..e43d6f9cf 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 extension ObservableStateMacro {
+    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..9b1991efe 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
         }
@@ -111,10 +111,10 @@ public struct RenderTesterResult<WorkflowType: Workflow> {
     }
 }
 
-extension RenderTesterResult where WorkflowType.State: Equatable {
+public extension RenderTesterResult where WorkflowType.State: Equatable {
     /// Verifies that the resulting state is equal to the given state.
     @discardableResult
-    public func assert(
+    func assert(
         state expectedState: WorkflowType.State,
         file: StaticString = #file,
         line: UInt = #line
@@ -128,27 +128,27 @@ extension RenderTesterResult where WorkflowType.State: Equatable {
     ///   - modifications: A function that receives the initial state
     ///   and is expected to mutate it to match the new state.
     @discardableResult
-    public func assertStateModifications(
+    func assertStateModifications(
         file: StaticString = #file,
         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
     }
 }
 
-extension RenderTesterResult where WorkflowType.Output: Equatable {
+public extension RenderTesterResult where WorkflowType.Output: Equatable {
     /// Verifies that the resulting output is equal to the given output.
     @discardableResult
-    public func assert(
+    func assert(
         output expectedOutput: WorkflowType.Output,
         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..e4c7cfeab 100644
--- a/WorkflowTesting/Sources/WorkflowActionTester.swift
+++ b/WorkflowTesting/Sources/WorkflowActionTester.swift
@@ -17,10 +17,10 @@
 import Workflow
 import XCTest
 
-extension WorkflowAction {
+public extension WorkflowAction {
     /// Returns a state tester containing `self`.
-    public static func tester(withState state: WorkflowType.State) -> WorkflowActionTester<WorkflowType, Self> {
-        return WorkflowActionTester(state: state)
+    static func tester(withState state: WorkflowType.State) -> WorkflowActionTester<WorkflowType, Self> {
+        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
         }
@@ -134,29 +134,29 @@ public struct WorkflowActionTester<WorkflowType, Action> where Action: WorkflowA
     /// - returns: A tester containing the current state.
 }
 
-extension WorkflowActionTester where WorkflowType.State: Equatable {
+public extension WorkflowActionTester where WorkflowType.State: Equatable {
     /// Triggers a test failure if the current state does not match the given expected state
     ///
     /// - Parameters:
     ///   - expectedState: The expected state
     /// - 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
+    func assert(state expectedState: WorkflowType.State, file: StaticString = #file, line: UInt = #line) -> WorkflowActionTester<WorkflowType, Action> {
+        verifyState { actualState in
             XCTAssertEqual(actualState, expectedState, file: file, line: line)
         }
     }
 }
 
-extension WorkflowActionTester where WorkflowType.Output: Equatable {
+public extension WorkflowActionTester where WorkflowType.Output: Equatable {
     /// Triggers a test failure if the produced output does not match the given expected output
     ///
     /// - Parameters:
     ///   - expectedState: The expected output
     /// - 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
+    func assert(output expectedOutput: WorkflowType.Output, file: StaticString = #file, line: UInt = #line) -> WorkflowActionTester<WorkflowType, Action> {
+        verifyOutput { actualOutput in
             XCTAssertEqual(actualOutput, expectedOutput, file: file, line: line)
         }
     }
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/AdaptedEnvironmentScreen.swift b/WorkflowUI/Sources/Screen/AdaptedEnvironmentScreen.swift
index 6a165d937..53e50d4e7 100644
--- a/WorkflowUI/Sources/Screen/AdaptedEnvironmentScreen.swift
+++ b/WorkflowUI/Sources/Screen/AdaptedEnvironmentScreen.swift
@@ -91,9 +91,9 @@ extension AdaptedEnvironmentScreen: Screen where Content: Screen {
     }
 }
 
-extension Screen {
+public extension Screen {
     /// Wraps this screen in an `AdaptedEnvironmentScreen` with the given environment key and value.
-    public func adaptedEnvironment<Key: ViewEnvironmentKey>(
+    func adaptedEnvironment<Key: ViewEnvironmentKey>(
         key: Key.Type,
         value: Key.Value
     ) -> AdaptedEnvironmentScreen<Self> {
@@ -101,7 +101,7 @@ extension Screen {
     }
 
     /// Wraps this screen in an `AdaptedEnvironmentScreen` with the given keypath and value.
-    public func adaptedEnvironment<Value>(
+    func adaptedEnvironment<Value>(
         keyPath: WritableKeyPath<ViewEnvironment, Value>,
         value: Value
     ) -> AdaptedEnvironmentScreen<Self> {
@@ -109,7 +109,7 @@ extension Screen {
     }
 
     /// Wraps this screen in an `AdaptedEnvironmentScreen` with the given configuration block.
-    public func adaptedEnvironment(
+    func adaptedEnvironment(
         adapting: @escaping (inout ViewEnvironment) -> Void
     ) -> AdaptedEnvironmentScreen<Self> {
         AdaptedEnvironmentScreen(wrapping: self, adapting: adapting)
diff --git a/WorkflowUI/Sources/Screen/AnyScreen/AnyScreen.swift b/WorkflowUI/Sources/Screen/AnyScreen/AnyScreen.swift
index 25f8833b9..e2d40f315 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,13 +31,13 @@ public struct AnyScreen: Screen {
     }
 
     public func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription {
-        return wrappedScreen.viewControllerDescription(environment: environment)
+        wrappedScreen.viewControllerDescription(environment: environment)
     }
 }
 
-extension Screen {
+public extension Screen {
     /// Wraps the screen in an AnyScreen
-    public func asAnyScreen() -> AnyScreen {
+    func asAnyScreen() -> AnyScreen {
         AnyScreen(self)
     }
 }
diff --git a/WorkflowUI/Sources/Screen/Screen.swift b/WorkflowUI/Sources/Screen/Screen.swift
index a4528410f..5fe2b2e62 100644
--- a/WorkflowUI/Sources/Screen/Screen.swift
+++ b/WorkflowUI/Sources/Screen/Screen.swift
@@ -28,11 +28,11 @@ public protocol Screen {
     func viewControllerDescription(environment: ViewEnvironment) -> ViewControllerDescription
 }
 
-extension Screen {
+public extension Screen {
     /// If the given view controller is of the correct type to be updated by this screen.
     ///
     /// If your view controller type can change between updates, call this method before invoking `update(viewController:with:)`.
-    public func canUpdate(viewController: UIViewController, with environment: ViewEnvironment) -> Bool {
+    func canUpdate(viewController: UIViewController, with environment: ViewEnvironment) -> Bool {
         viewControllerDescription(environment: environment).canUpdate(viewController: viewController)
     }
 
@@ -41,13 +41,13 @@ extension Screen {
     /// ### Note
     /// You must pass a view controller previously created by a compatible `ViewControllerDescription`
     /// that passes `canUpdate(viewController:with:)`. Failure to do so will result in a fatal precondition.
-    public func update(viewController: UIViewController, with environment: ViewEnvironment) {
+    func update(viewController: UIViewController, with environment: ViewEnvironment) {
         viewControllerDescription(environment: environment).update(viewController: viewController)
     }
 
     /// Construct and update a new view controller as described by this Screen.
     /// The view controller will be updated before it is returned, so it is fully configured and prepared for display.
-    public func buildViewController(in environment: ViewEnvironment) -> UIViewController {
+    func buildViewController(in environment: ViewEnvironment) -> UIViewController {
         viewControllerDescription(environment: environment).buildViewController()
     }
 }
diff --git a/WorkflowUI/Sources/Screen/ScreenContaining.swift b/WorkflowUI/Sources/Screen/ScreenContaining.swift
index a3054b400..a90d470b5 100644
--- a/WorkflowUI/Sources/Screen/ScreenContaining.swift
+++ b/WorkflowUI/Sources/Screen/ScreenContaining.swift
@@ -32,11 +32,11 @@ public protocol SingleScreenContaining {
     var primaryScreen: any Screen { get }
 }
 
-extension SingleScreenContaining {
+public extension SingleScreenContaining {
     /// Iteratively traverses a sequence of `primaryScreen` values until one is found that does _not_
     /// conform to `SingleScreenContaining`. Put another way, this returns the first `primaryScreen`
     /// that is a `Screen` and _not_ a `SingleScreenContaining` type.
-    public func findInnermostPrimaryScreen() -> any Screen {
+    func findInnermostPrimaryScreen() -> any Screen {
         var result = primaryScreen
 
         while let nextContainer = result as? SingleScreenContaining {
diff --git a/WorkflowUI/Sources/Screen/ScreenViewController.swift b/WorkflowUI/Sources/Screen/ScreenViewController.swift
index 04660a36a..322d29467 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)
     }
@@ -69,11 +69,11 @@ open class ScreenViewController<ScreenType: Screen>: WorkflowUIViewController {
     open func screenDidChange(from previousScreen: ScreenType, previousEnvironment: ViewEnvironment) {}
 }
 
-extension ScreenViewController {
+public extension ScreenViewController {
     /// Convenience to create a view controller description for the given screen
     /// value. See the example on the comment for ScreenViewController for
     /// usage.
-    public final class func description(
+    final class func description(
         for screen: ScreenType,
         environment: ViewEnvironment,
         performInitialUpdate: Bool = true
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..139a9f77a 100644
--- a/WorkflowUI/Sources/ViewControllerDescription/UIViewController+Extensions.swift
+++ b/WorkflowUI/Sources/ViewControllerDescription/UIViewController+Extensions.swift
@@ -18,7 +18,7 @@
 
 import UIKit
 
-extension UpdateChildScreenViewController where Self: UIViewController {
+public extension UpdateChildScreenViewController where Self: UIViewController {
     /// Updates the view controller at the given `child` key path with the
     /// `ViewControllerDescription` from `screen`. If the type of the underlying view
     /// controller changes between update passes, this method will remove
@@ -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>(
+    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..de631999e 100644
--- a/WorkflowUI/Sources/ViewControllerDescription/ViewControllerDescription.swift
+++ b/WorkflowUI/Sources/ViewControllerDescription/ViewControllerDescription.swift
@@ -179,12 +179,12 @@ public struct ViewControllerDescription {
     }
 }
 
-extension ViewControllerDescription {
+public extension ViewControllerDescription {
     /// Describes the `UIViewController` type that backs the `ViewControllerDescription`
     /// in a way that is `Equatable` and `Hashable`. When implementing view controller
     /// updating and diffing, you can use this type to identify if the backing view controller
     /// type changed.
-    public struct KindIdentifier: Hashable {
+    struct KindIdentifier: Hashable {
         fileprivate let viewControllerType: UIViewController.Type
 
         private let checkViewControllerType: (UIViewController) -> Bool
@@ -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
@@ -217,11 +217,10 @@ extension ViewControllerDescription {
     }
 }
 
-extension ViewControllerDescription {
-    fileprivate class PropagationNode: ViewEnvironmentObserving {
-
+fileprivate extension ViewControllerDescription {
+    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/XCTestCase+Extensions.swift b/WorkflowUI/Tests/XCTestCase+Extensions.swift
index 84b92e67d..e6aa4cf07 100644
--- a/WorkflowUI/Tests/XCTestCase+Extensions.swift
+++ b/WorkflowUI/Tests/XCTestCase+Extensions.swift
@@ -11,7 +11,7 @@ import Foundation
 import UIKit
 import XCTest
 
-extension XCTestCase {
+public extension XCTestCase {
     ///
     /// Call this method to show a view controller in the test host application
     /// during a unit test. The view controller will be the size of host application's device.
@@ -20,7 +20,7 @@ extension XCTestCase {
     ///
     /// A test failure will occur if the host application does not exist, or does not have a root view controller.
     ///
-    public func show<ViewController: UIViewController>(
+    func show<ViewController: UIViewController>(
         vc viewController: ViewController,
         loadAndPlaceView: Bool = true,
         test: (ViewController) throws -> Void