diff --git a/src/log/normal.c b/src/log/normal.c
index 3bae3b1..b4c2d79 100644
--- a/src/log/normal.c
+++ b/src/log/normal.c
@@ -143,12 +143,12 @@ void normal_log_pre_suite(struct criterion_suite_set *set) {
 }
 
 struct criterion_output_provider normal_logging = {
-    .log_pre_all = normal_log_pre_all,
-    .log_pre_init = normal_log_pre_init,
-    .log_pre_suite = normal_log_pre_suite,
-    .log_post_test = normal_log_post_test,
-    .log_assert = normal_log_assert,
-    .log_post_suite = normal_log_post_suite,
-    .log_post_all = normal_log_post_all,
+    .log_pre_all    = normal_log_pre_all,
+    .log_pre_init   = normal_log_pre_init,
+    .log_pre_suite  = normal_log_pre_suite,
+    .log_assert     = normal_log_assert,
     .log_test_crash = normal_log_test_crash,
+    .log_post_test  = normal_log_post_test,
+    .log_post_suite = normal_log_post_suite,
+    .log_post_all   = normal_log_post_all,
 };
diff --git a/src/main.c b/src/main.c
index dde6ec2..467e49d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -97,7 +97,7 @@ int list_tests(bool unicode) {
                     --tests == 0 ? end : node,
                     join,
                     t->name,
-                    is_disabled(&s->suite, t) ? "(disabled)" : "");
+                    is_disabled(&s->suite, t) ? " (disabled)" : "");
         }
     }
     return 0;
diff --git a/src/runner.c b/src/runner.c
index 14ffcb9..c4a535e 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -148,6 +148,15 @@ static inline bool is_disabled(struct criterion_test *t, struct criterion_suite
     return t->data->disabled || (s->data && s->data->disabled);
 }
 
+#define push_event(Kind, ...)                                       \
+    do {                                                            \
+        stat_push_event(stats,                                      \
+                suite_stats,                                        \
+                test_stats,                                         \
+                &(struct event) { .kind = Kind, __VA_ARGS__ });     \
+        report(Kind, test_stats);                                   \
+    } while (0)
+
 static void run_test(struct criterion_global_stats *stats,
         struct criterion_suite_stats *suite_stats,
         struct criterion_test *test,
@@ -156,8 +165,7 @@ static void run_test(struct criterion_global_stats *stats,
     smart struct criterion_test_stats *test_stats = test_stats_init(test);
 
     if (is_disabled(test, suite)) {
-        struct event ev = { .kind = PRE_TEST };
-        stat_push_event(stats, suite_stats, test_stats, &ev);
+        stat_push_event(stats, suite_stats, test_stats, &(struct event) { .kind = PRE_TEST });
         return;
     }
 
@@ -182,18 +190,11 @@ static void run_test(struct criterion_global_stats *stats,
     if (status.kind == SIGNAL) {
         test_stats->signal = status.status;
         if (test->data->signal == 0) {
-            struct event ev = { .kind = TEST_CRASH };
-            stat_push_event(stats, suite_stats, test_stats, &ev);
-            report(TEST_CRASH, test_stats);
+            push_event(TEST_CRASH);
         } else {
             double elapsed_time = 0;
-            struct event ev = { .kind = POST_TEST, .data = &elapsed_time };
-            stat_push_event(stats, suite_stats, test_stats, &ev);
-            report(POST_TEST, test_stats);
-
-            ev = (struct event) { .kind = POST_FINI, .data = NULL };
-            stat_push_event(stats, suite_stats, test_stats, &ev);
-            report(POST_FINI, test_stats);
+            push_event(POST_TEST, .data = &elapsed_time);
+            push_event(POST_FINI);
         }
     }
 }