diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index b1bccdbfd..bec67bff5 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -87,7 +87,7 @@ static int parse_cmd_opts(function_cmd_opts_t &opts, int *optind,  //!OCLINT(hig
             case 'j':
             case 'p': {
                 pid_t pid;
-                event_t e(EVENT_ANY);
+                event_t e(event_type_t::any);
 
                 if ((opt == 'j') && (wcscasecmp(w.woptarg, L"caller") == 0)) {
                     job_id_t job_id = -1;
@@ -113,11 +113,11 @@ static int parse_cmd_opts(function_cmd_opts_t &opts, int *optind,  //!OCLINT(hig
                             _(L"%ls: Cannot find calling job for event handler"), cmd);
                         return STATUS_INVALID_ARGS;
                     }
-                    e.type = EVENT_JOB_ID;
+                    e.type = event_type_t::job_exit;
                     e.param1.job_id = job_id;
                 } else if ((opt == 'p') && (wcscasecmp(w.woptarg, L"%self") == 0)) {
                     pid = getpid();
-                    e.type = EVENT_EXIT;
+                    e.type = event_type_t::exit;
                     e.param1.pid = pid;
                 } else {
                     pid = fish_wcstoi(w.woptarg);
@@ -127,7 +127,7 @@ static int parse_cmd_opts(function_cmd_opts_t &opts, int *optind,  //!OCLINT(hig
                         return STATUS_INVALID_ARGS;
                     }
 
-                    e.type = EVENT_EXIT;
+                    e.type = event_type_t::exit;
                     e.param1.pid = (opt == 'j' ? -1 : 1) * abs(pid);
                 }
                 opts.events.push_back(e);
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 42575b503..1acb4e085 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -126,7 +126,7 @@ static wcstring functions_def(const wcstring &name) {
     wcstring desc, def;
     function_get_desc(name, desc);
     function_get_definition(name, def);
-    event_t search(EVENT_ANY);
+    event_t search(event_type_t::any);
     search.function_name = name;
     std::vector<std::shared_ptr<event_t>> ev;
     event_get(search, &ev);
@@ -154,27 +154,27 @@ static wcstring functions_def(const wcstring &name) {
 
     for (const auto &next : ev) {
         switch (next->type) {
-            case EVENT_SIGNAL: {
+            case event_type_t::signal: {
                 append_format(out, L" --on-signal %ls", sig2wcs(next->param1.signal));
                 break;
             }
-            case EVENT_VARIABLE: {
+            case event_type_t::variable: {
                 append_format(out, L" --on-variable %ls", next->str_param1.c_str());
                 break;
             }
-            case EVENT_EXIT: {
+            case event_type_t::exit: {
                 if (next->param1.pid > 0)
                     append_format(out, L" --on-process-exit %d", next->param1.pid);
                 else
                     append_format(out, L" --on-job-exit %d", -next->param1.pid);
                 break;
             }
-            case EVENT_JOB_ID: {
+            case event_type_t::job_exit: {
                 const job_t *j = job_t::from_job_id(next->param1.job_id);
                 if (j) append_format(out, L" --on-job-exit %d", j->pgid);
                 break;
             }
-            case EVENT_GENERIC: {
+            case event_type_t::generic: {
                 append_format(out, L" --on-event %ls", next->str_param1.c_str());
                 break;
             }
diff --git a/src/event.cpp b/src/event.cpp
index 55b116564..9ebf3b1dc 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -108,24 +108,24 @@ static int event_match(const event_t &classv, const event_t &instance) {
         return 0;
     }
 
-    if (classv.type == EVENT_ANY) return 1;
+    if (classv.type == event_type_t::any) return 1;
     if (classv.type != instance.type) return 0;
 
     switch (classv.type) {
-        case EVENT_SIGNAL: {
+        case event_type_t::signal: {
             return classv.param1.signal == instance.param1.signal;
         }
-        case EVENT_VARIABLE: {
+        case event_type_t::variable: {
             return instance.str_param1 == classv.str_param1;
         }
-        case EVENT_EXIT: {
+        case event_type_t::exit: {
             if (classv.param1.pid == EVENT_ANY_PID) return 1;
             return classv.param1.pid == instance.param1.pid;
         }
-        case EVENT_JOB_ID: {
+        case event_type_t::job_exit: {
             return classv.param1.job_id == instance.param1.job_id;
         }
-        case EVENT_GENERIC: {
+        case event_type_t::generic: {
             return instance.str_param1 == classv.str_param1;
         }
         default: {
@@ -146,24 +146,24 @@ static int event_is_blocked(const event_t &e) {
 
     size_t idx = 0;
     while ((block = parser.block_at_index(idx++))) {
-        if (event_block_list_blocks_type(block->event_blocks, e.type)) return true;
+        if (event_block_list_blocks_type(block->event_blocks)) return true;
     }
-    return event_block_list_blocks_type(parser.global_event_blocks, e.type);
+    return event_block_list_blocks_type(parser.global_event_blocks);
 }
 
 wcstring event_get_desc(const event_t &e) {
     wcstring result;
     switch (e.type) {
-        case EVENT_SIGNAL: {
+        case event_type_t::signal: {
             result = format_string(_(L"signal handler for %ls (%ls)"), sig2wcs(e.param1.signal),
                                    signal_get_desc(e.param1.signal));
             break;
         }
-        case EVENT_VARIABLE: {
+        case event_type_t::variable: {
             result = format_string(_(L"handler for variable '%ls'"), e.str_param1.c_str());
             break;
         }
-        case EVENT_EXIT: {
+        case event_type_t::exit: {
             if (e.param1.pid > 0) {
                 result = format_string(_(L"exit handler for process %d"), e.param1.pid);
             } else {
@@ -178,7 +178,7 @@ wcstring event_get_desc(const event_t &e) {
             }
             break;
         }
-        case EVENT_JOB_ID: {
+        case event_type_t::job_exit: {
             job_t *j = job_t::from_job_id(e.param1.job_id);
             if (j) {
                 result = format_string(_(L"exit handler for job %d, '%ls'"), j->job_id,
@@ -188,7 +188,7 @@ wcstring event_get_desc(const event_t &e) {
             }
             break;
         }
-        case EVENT_GENERIC: {
+        case event_type_t::generic: {
             result = format_string(_(L"handler for generic event '%ls'"), e.str_param1.c_str());
             break;
         }
@@ -217,11 +217,11 @@ static void show_all_handlers(void) {
 static wcstring event_desc_compact(const event_t &event) {
     wcstring res;
     switch (event.type) {
-        case EVENT_ANY: {
+        case event_type_t::any: {
             res = L"EVENT_ANY";
             break;
         }
-        case EVENT_VARIABLE: {
+        case event_type_t::variable: {
             if (event.str_param1.c_str()) {
                 res = format_string(L"EVENT_VARIABLE($%ls)", event.str_param1.c_str());
             } else {
@@ -229,11 +229,11 @@ static wcstring event_desc_compact(const event_t &event) {
             }
             break;
         }
-        case EVENT_SIGNAL: {
+        case event_type_t::signal: {
             res = format_string(L"EVENT_SIGNAL(%ls)", sig2wcs(event.param1.signal));
             break;
         }
-        case EVENT_EXIT: {
+        case event_type_t::exit: {
             if (event.param1.pid == EVENT_ANY_PID) {
                 res = wcstring(L"EVENT_EXIT([all child processes])");
             } else if (event.param1.pid > 0) {
@@ -249,7 +249,7 @@ static wcstring event_desc_compact(const event_t &event) {
             }
             break;
         }
-        case EVENT_JOB_ID: {
+        case event_type_t::job_exit: {
             job_t *j = job_t::from_job_id(event.param1.job_id);
             if (j)
                 res =
@@ -258,7 +258,7 @@ static wcstring event_desc_compact(const event_t &event) {
                 res = format_string(L"EVENT_JOB_ID(jobid %d)", event.param1.job_id);
             break;
         }
-        case EVENT_GENERIC: {
+        case event_type_t::generic: {
             res = format_string(L"EVENT_GENERIC(%ls)", event.str_param1.c_str());
             break;
         }
@@ -280,7 +280,7 @@ void event_add_handler(const event_t &event) {
     }
 
     shared_ptr<event_t> e = std::make_shared<event_t>(event);
-    if (e->type == EVENT_SIGNAL) {
+    if (e->type == event_type_t::signal) {
         signal_handle(e->param1.signal, 1);
         set_signal_observed(e->param1.signal, true);
     }
@@ -304,7 +304,7 @@ void event_remove(const event_t &criterion) {
 
         // If this event was a signal handler and no other handler handles the specified signal
         // type, do not handle that type of signal any more.
-        if (n->type == EVENT_SIGNAL) {
+        if (n->type == event_type_t::signal) {
             event_t e = event_t::signal_event(n->param1.signal);
             if (event_get(e, NULL) == 1) {
                 signal_handle(e.param1.signal, 0);
@@ -416,7 +416,7 @@ static void event_fire_delayed() {
     if (signals.any()) {
         for (uint32_t sig=0; sig < signals.size(); sig++) {
             if (signals.test(sig)) {
-                auto e = std::make_shared<event_t>(EVENT_SIGNAL);
+                auto e = std::make_shared<event_t>(event_type_t::signal);
                 e->param1.signal = sig;
                 e->arguments.push_back(sig2wcs(sig));
                 to_send.push_back(std::move(e));
@@ -459,13 +459,11 @@ struct event_type_name_t {
     const wchar_t *name;
 };
 
-static const event_type_name_t events_mapping[] = {
-    {EVENT_SIGNAL, L"signal"},
-    {EVENT_VARIABLE, L"variable"},
-    {EVENT_EXIT, L"exit"},
-    {EVENT_JOB_ID, L"job-id"},
-    {EVENT_GENERIC, L"generic"}
-};
+static const event_type_name_t events_mapping[] = {{event_type_t::signal, L"signal"},
+                                                   {event_type_t::variable, L"variable"},
+                                                   {event_type_t::exit, L"exit"},
+                                                   {event_type_t::job_exit, L"job-id"},
+                                                   {event_type_t::generic, L"generic"}};
 
 maybe_t<event_type_t> event_type_for_name(const wcstring &name) {
     for (const auto &em : events_mapping) {
@@ -492,13 +490,15 @@ void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter) {
             [](const shared_ptr<event_t> &e1, const shared_ptr<event_t> &e2) {
                 if (e1->type == e2->type) {
                     switch (e1->type) {
-                        case EVENT_SIGNAL:
+                        case event_type_t::signal:
                             return e1->param1.signal < e2->param1.signal;
-                        case EVENT_JOB_ID:
+                        case event_type_t::exit:
+                            return e1->param1.pid < e2->param1.pid;
+                        case event_type_t::job_exit:
                             return e1->param1.job_id < e2->param1.job_id;
-                        case EVENT_VARIABLE:
-                        case EVENT_ANY:
-                        case EVENT_GENERIC:
+                        case event_type_t::variable:
+                        case event_type_t::any:
+                        case event_type_t::generic:
                             return e1->str_param1 < e2->str_param1;
                     }
                 }
@@ -519,16 +519,16 @@ void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter) {
             streams.out.append_format(L"Event %ls\n", event_name_for_type(*last_type));
         }
         switch (evt->type) {
-            case EVENT_SIGNAL:
+            case event_type_t::signal:
                 streams.out.append_format(L"%ls %ls\n", sig2wcs(evt->param1.signal),
                         evt->function_name.c_str());
                 break;
-            case EVENT_JOB_ID:
+            case event_type_t::job_exit:
                 streams.out.append_format(L"%d %ls\n", evt->param1,
                         evt->function_name.c_str());
                 break;
-            case EVENT_VARIABLE:
-            case EVENT_GENERIC:
+            case event_type_t::variable:
+            case event_type_t::generic:
                 streams.out.append_format(L"%ls %ls\n", evt->str_param1.c_str(),
                         evt->function_name.c_str());
                 break;
@@ -542,30 +542,30 @@ void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter) {
 void event_fire_generic(const wchar_t *name, wcstring_list_t *args) {
     CHECK(name, );
 
-    event_t ev(EVENT_GENERIC);
+    event_t ev(event_type_t::generic);
     ev.str_param1 = name;
     if (args) ev.arguments = *args;
     event_fire(&ev);
 }
 
-event_t::event_t(int t) : type(t), param1(), str_param1(), function_name(), arguments() {}
+event_t::event_t(event_type_t t) : type(t), param1(), str_param1(), function_name(), arguments() {}
 
 event_t::~event_t() = default;
 
 event_t event_t::signal_event(int sig) {
-    event_t event(EVENT_SIGNAL);
+    event_t event(event_type_t::signal);
     event.param1.signal = sig;
     return event;
 }
 
 event_t event_t::variable_event(const wcstring &str) {
-    event_t event(EVENT_VARIABLE);
+    event_t event(event_type_t::variable);
     event.str_param1 = str;
     return event;
 }
 
 event_t event_t::generic_event(const wcstring &str) {
-    event_t event(EVENT_GENERIC);
+    event_t event(event_type_t::generic);
     event.str_param1 = str;
     return event;
 }
diff --git a/src/event.h b/src/event.h
index 95d787456..a56ee98ce 100644
--- a/src/event.h
+++ b/src/event.h
@@ -19,20 +19,20 @@
 #define EVENT_ANY_PID 0
 
 /// Enumeration of event types.
-enum event_type_t {
+enum class event_type_t {
     /// Matches any event type (Not always any event, as the function name may limit the choice as
     /// well.
-    EVENT_ANY,
+    any,
     /// An event triggered by a signal.
-    EVENT_SIGNAL,
+    signal,
     /// An event triggered by a variable update.
-    EVENT_VARIABLE,
+    variable,
     /// An event triggered by a job or process exit.
-    EVENT_EXIT,
+    exit,
     /// An event triggered by a job exit.
-    EVENT_JOB_ID,
+    job_exit,
     /// A generic event.
-    EVENT_GENERIC,
+    generic,
 };
 
 /// The structure which represents an event. The event_t struct has several event-related use-cases:
@@ -47,7 +47,7 @@ enum event_type_t {
 struct event_t {
    public:
     /// Type of event.
-    int type;
+    event_type_t type;
 
     /// The type-specific parameter. The int types are one of the following:
     ///
@@ -73,7 +73,7 @@ struct event_t {
     /// situations, the value of this variable is ignored.
     wcstring_list_t arguments;
 
-    explicit event_t(int t);
+    explicit event_t(event_type_t t);
     ~event_t();
 
     static event_t signal_event(int sig);
diff --git a/src/fish.cpp b/src/fish.cpp
index e481cd4cc..d75eaae44 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -434,7 +434,7 @@ int main(int argc, char **argv) {
 
     // TODO: The generic process-exit event is useless and unused.
     // Remove this in future.
-    proc_fire_event(L"PROCESS_EXIT", EVENT_EXIT, getpid(), exit_status);
+    proc_fire_event(L"PROCESS_EXIT", event_type_t::exit, getpid(), exit_status);
 
     // Trigger any exit handlers.
     wcstring_list_t event_args = {to_string(exit_status)};
diff --git a/src/function.cpp b/src/function.cpp
index 9d51d1699..1fae86831 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -224,7 +224,7 @@ static bool function_remove_ignore_autoload(const wcstring &name, bool tombstone
     if (iter->second.is_autoload && tombstone) function_tombstones.insert(name);
 
     loaded_functions.erase(iter);
-    event_t ev(EVENT_ANY);
+    event_t ev(event_type_t::any);
     ev.function_name = name;
     event_remove(ev);
     return true;
diff --git a/src/parser.h b/src/parser.h
index 17b1f970f..92a470f88 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -26,7 +26,7 @@ struct event_blockage_t {
 
 typedef std::list<event_blockage_t> event_blockage_list_t;
 
-inline bool event_block_list_blocks_type(const event_blockage_list_t &ebls, int type) {
+inline bool event_block_list_blocks_type(const event_blockage_list_t &ebls) {
     return !ebls.empty();
 }
 
diff --git a/src/proc.cpp b/src/proc.cpp
index 5753f7c2f..9baa1bb00 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -107,7 +107,7 @@ void set_proc_had_barrier(bool flag) {
 }
 
 /// The event variable used to send all process event.
-static event_t event(0);
+static event_t event{event_type_t::any};
 
 /// A stack containing the values of is_interactive. Used by proc_push_interactive and
 /// proc_pop_interactive.
@@ -486,7 +486,7 @@ static void print_job_status(const job_t *j, job_status_t status) {
     fwprintf(stdout, L"\n");
 }
 
-void proc_fire_event(const wchar_t *msg, int type, pid_t pid, int status) {
+void proc_fire_event(const wchar_t *msg, event_type_t type, pid_t pid, int status) {
     event.type = type;
     event.param1.pid = pid;
 
@@ -535,7 +535,7 @@ static bool process_clean_after_marking(bool allow_interactive) {
             // Remove this in future.
             // Update: This event is used for cleaning up the psub temporary files and folders.
             // Removing it breaks the psub tests as a result.
-            proc_fire_event(L"PROCESS_EXIT", EVENT_EXIT, p->pid,
+            proc_fire_event(L"PROCESS_EXIT", event_type_t::exit, p->pid,
                             (WIFSIGNALED(s) ? -1 : WEXITSTATUS(s)));
 
             // Ignore signal SIGPIPE.We issue it ourselves to the pipe writer when the pipe reader
@@ -604,9 +604,9 @@ static bool process_clean_after_marking(bool allow_interactive) {
             // or jobs that consist entirely of builtins (and hence don't have a process).
             // This causes issues if fish is PID 2, which is quite common on WSL. See #4582.
             if (j->pgid != INVALID_PID) {
-                proc_fire_event(L"JOB_EXIT", EVENT_EXIT, -j->pgid, 0);
+                proc_fire_event(L"JOB_EXIT", event_type_t::exit, -j->pgid, 0);
             }
-            proc_fire_event(L"JOB_EXIT", EVENT_JOB_ID, j->job_id, 0);
+            proc_fire_event(L"JOB_EXIT", event_type_t::job_exit, j->job_id, 0);
 
             job_remove(j);
         } else if (j->is_stopped() && !j->get_flag(job_flag_t::NOTIFIED)) {
diff --git a/src/proc.h b/src/proc.h
index 30ed6e921..3e986f160 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -17,6 +17,7 @@
 
 #include "common.h"
 #include "enum_set.h"
+#include "event.h"
 #include "io.h"
 #include "parse_tree.h"
 #include "tnode.h"
@@ -439,7 +440,7 @@ void proc_sanity_check();
 
 /// Send a process/job exit event notification. This function is a convenience wrapper around
 /// event_fire().
-void proc_fire_event(const wchar_t *msg, int type, pid_t pid, int status);
+void proc_fire_event(const wchar_t *msg, event_type_t type, pid_t pid, int status);
 
 /// Initializations.
 void proc_init();