4 files changed, 20 insertions, 32 deletions
diff --git a/mingling_core/src/program/collection.rs b/mingling_core/src/program/collection.rs
index fe78979..14705ac 100644
--- a/mingling_core/src/program/collection.rs
+++ b/mingling_core/src/program/collection.rs
@@ -21,8 +21,16 @@ pub use mock::*;
 pub trait ProgramCollect {
     /// Enum type representing internal IDs for the program
     type Enum;
+    /// Error type when a dispatcher is not found for the given member
     type ErrorDispatcherNotFound: Grouped<Self::Enum>;
+
+    /// Error type when a renderer is not found for the given member
     type ErrorRendererNotFound: Grouped<Self::Enum>;
+
+    /// Result type for an empty chain result
+    ///
+    /// When the `extra_macros` feature is enabled,
+    /// you can use the `empty_result!()` macro to create this
     type ResultEmpty: Grouped<Self::Enum>;
 
     /// Use a prefix tree to quickly match arguments and dispatch to an Entry
diff --git a/mingling_core/src/program/hook.rs b/mingling_core/src/program/hook.rs
index db1691b..48f632f 100644
--- a/mingling_core/src/program/hook.rs
+++ b/mingling_core/src/program/hook.rs
@@ -144,8 +144,9 @@ where
 {
     /// Adds a typed hook to the program. The hook will be called at the appropriate
     /// lifecycle events.
-    pub fn with_hook(&mut self, hook: ProgramHook<C>) {
+    pub fn with_hook(&mut self, hook: ProgramHook<C>) -> &mut Self {
         self.hooks.push(hook);
+        self
     }
 
     pub(crate) fn run_hook_on_begin(&self, info: HookBeginInfo) {
diff --git a/mingling_core/src/program/once_exec.rs b/mingling_core/src/program/once_exec.rs
index 9d6f1e4..a846d04 100644
--- a/mingling_core/src/program/once_exec.rs
+++ b/mingling_core/src/program/once_exec.rs
@@ -79,23 +79,12 @@ where
         };
 
         // Read exit code
-        let exit_code = result.exit_code;
-
         // Render result
-        if stdout_setting.render_output && !result.is_empty() {
-            print!("{result}");
-
-            if let Err(e) = std::io::Write::flush(&mut std::io::stdout())
-                && stdout_setting.error_output
-            {
-                eprintln!("{e}");
-                1
-            } else {
-                exit_code
-            }
-        } else {
-            exit_code
+        if stdout_setting.render_output {
+            result.std_print();
         }
+
+        result.exit_code
     }
 
     /// Run the command line program, then exit
@@ -217,23 +206,12 @@ where
         };
 
         // Read exit code
-        let exit_code = result.exit_code;
-
         // Render result
-        if stdout_setting.render_output && !result.is_empty() {
-            print!("{result}");
-
-            if let Err(e) = std::io::Write::flush(&mut std::io::stdout())
-                && stdout_setting.error_output
-            {
-                eprintln!("{e}");
-                1
-            } else {
-                exit_code
-            }
-        } else {
-            exit_code
+        if stdout_setting.render_output {
+            result.std_print();
         }
+
+        result.exit_code
     }
 
     /// Run the command line program, then exit
diff --git a/mingling_core/src/program/setup.rs b/mingling_core/src/program/setup.rs
index 838c29a..a8ff114 100644
--- a/mingling_core/src/program/setup.rs
+++ b/mingling_core/src/program/setup.rs
@@ -29,8 +29,9 @@ where
     C: ProgramCollect<Enum = C>,
 {
     /// Load and execute init logic
-    pub fn with_setup<S: ProgramSetup<C> + 'static>(&mut self, setup: S) {
+    pub fn with_setup<S: ProgramSetup<C> + 'static>(&mut self, setup: S) -> &mut Self {
         S::setup(setup, self);
+        self
     }
 }